diff --git a/server/ctrlsubsonic/handlers_common.go b/server/ctrlsubsonic/handlers_common.go
index d9c1993..0becca3 100644
--- a/server/ctrlsubsonic/handlers_common.go
+++ b/server/ctrlsubsonic/handlers_common.go
@@ -3,7 +3,6 @@ package ctrlsubsonic
 import (
 	"log"
 	"net/http"
-	"sort"
 	"time"
 	"unicode"
 
@@ -122,137 +121,6 @@ func (c *Controller) ServeNotFound(r *http.Request) *spec.Response {
 	return spec.NewError(70, "view not found")
 }
 
-func (c *Controller) ServeGetPlaylists(r *http.Request) *spec.Response {
-	user := r.Context().Value(CtxUser).(*db.User)
-	var playlists []*db.Playlist
-	c.DB.Where("user_id=?", user.ID).Find(&playlists)
-	sub := spec.NewResponse()
-	sub.Playlists = &spec.Playlists{
-		List: make([]*spec.Playlist, len(playlists)),
-	}
-	for i, playlist := range playlists {
-		sub.Playlists.List[i] = spec.NewPlaylist(playlist)
-		sub.Playlists.List[i].Owner = user.Name
-		sub.Playlists.List[i].SongCount = playlist.TrackCount
-	}
-	return sub
-}
-
-func (c *Controller) ServeGetPlaylist(r *http.Request) *spec.Response {
-	params := r.Context().Value(CtxParams).(params.Params)
-	playlistID, err := params.GetFirstInt("id", "playlistId")
-	if err != nil {
-		return spec.NewError(10, "please provide an `id` parameter")
-	}
-	playlist := db.Playlist{}
-	err = c.DB.
-		Where("id=?", playlistID).
-		Find(&playlist).
-		Error
-	if gorm.IsRecordNotFoundError(err) {
-		return spec.NewError(70, "playlist with id `%d` not found", playlistID)
-	}
-	user := r.Context().Value(CtxUser).(*db.User)
-	sub := spec.NewResponse()
-	sub.Playlist = spec.NewPlaylist(&playlist)
-	sub.Playlist.Owner = user.Name
-	sub.Playlist.SongCount = playlist.TrackCount
-	trackIDs := playlist.GetItems()
-	sub.Playlist.List = make([]*spec.TrackChild, len(trackIDs))
-	for i, id := range trackIDs {
-		track := db.Track{}
-		err := c.DB.
-			Where("id=?", id).
-			Preload("Album").
-			Find(&track).
-			Error
-		if gorm.IsRecordNotFoundError(err) {
-			log.Printf("wasn't able to find track with id %d", id)
-			continue
-		}
-		sub.Playlist.List[i] = spec.NewTCTrackByFolder(&track, track.Album)
-	}
-	return sub
-}
-
-func (c *Controller) ServeCreatePlaylist(r *http.Request) *spec.Response {
-	user := r.Context().Value(CtxUser).(*db.User)
-	params := r.Context().Value(CtxParams).(params.Params)
-	playlistID := params.GetFirstOrInt( /* default */ 0, "id", "playlistId")
-	// playlistID may be 0 from above. in that case we get a new playlist
-	// as intended
-	var playlist db.Playlist
-	c.DB.
-		Where("id=?", playlistID).
-		FirstOrCreate(&playlist)
-	// ** begin update meta info
-	playlist.UserID = user.ID
-	if val, err := params.Get("name"); err == nil {
-		playlist.Name = val
-	}
-
-	// ** begin replace song IDs
-	trackIDs := []int{}
-        if p, err := params.GetIDList("songId"); err == nil {
-		for _, i := range p {
-			trackIDs = append(trackIDs, i.Value)
-		}
-	}
-
-	// Set the items of the playlist
-	playlist.SetItems(trackIDs)
-	c.DB.Save(playlist)
-
-	// Return the created/updated playlist.
-	return c.ServeGetPlaylist(r)
-}
-
-func (c *Controller) ServeUpdatePlaylist(r *http.Request) *spec.Response {
-	user := r.Context().Value(CtxUser).(*db.User)
-	params := r.Context().Value(CtxParams).(params.Params)
-	playlistID := params.GetFirstOrInt( /* default */ 0, "id", "playlistId")
-	// playlistID may be 0 from above. in that case we get a new playlist
-	// as intended
-	var playlist db.Playlist
-	c.DB.
-		Where("id=?", playlistID).
-		FirstOrCreate(&playlist)
-	// ** begin update meta info
-	playlist.UserID = user.ID
-	if val, err := params.Get("name"); err == nil {
-		playlist.Name = val
-	}
-	if val, err := params.Get("comment"); err == nil {
-		playlist.Comment = val
-	}
-	trackIDs := playlist.GetItems()
-	// ** begin delete items
-	if p, err := params.GetIntList("songIndexToRemove"); err == nil {
-		sort.Sort(sort.Reverse(sort.IntSlice(p)))
-		for _, i := range p {
-			trackIDs = append(trackIDs[:i], trackIDs[i+1:]...)
-		}
-	}
-	// ** begin add items
-	if p, err := params.GetIDList("songIdToAdd"); err == nil {
-		for _, i := range p {
-			trackIDs = append(trackIDs, i.Value)
-		}
-	}
-	//
-	playlist.SetItems(trackIDs)
-	c.DB.Save(playlist)
-	return spec.NewResponse()
-}
-
-func (c *Controller) ServeDeletePlaylist(r *http.Request) *spec.Response {
-	params := r.Context().Value(CtxParams).(params.Params)
-	c.DB.
-		Where("id=?", params.GetOrInt("id", 0)).
-		Delete(&db.Playlist{})
-	return spec.NewResponse()
-}
-
 func (c *Controller) ServeGetPlayQueue(r *http.Request) *spec.Response {
 	user := r.Context().Value(CtxUser).(*db.User)
 	queue := db.PlayQueue{}
diff --git a/server/ctrlsubsonic/handlers_playlist.go b/server/ctrlsubsonic/handlers_playlist.go
new file mode 100644
index 0000000..89f1b18
--- /dev/null
+++ b/server/ctrlsubsonic/handlers_playlist.go
@@ -0,0 +1,149 @@
+package ctrlsubsonic
+
+import (
+	"log"
+	"net/http"
+	"sort"
+
+	"github.com/jinzhu/gorm"
+
+	"go.senan.xyz/gonic/server/ctrlsubsonic/params"
+	"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
+	"go.senan.xyz/gonic/server/db"
+)
+
+func playlistRender(c *Controller, playlist *db.Playlist) *spec.Playlist {
+	user := &db.User{}
+	c.DB.Where("id=?", playlist.UserID).Find(user)
+	//
+	resp := spec.NewPlaylist(playlist)
+	resp.Owner = user.Name
+	resp.SongCount = playlist.TrackCount
+	//
+	trackIDs := playlist.GetItems()
+	resp.List = make([]*spec.TrackChild, len(trackIDs))
+	for i, id := range trackIDs {
+		track := db.Track{}
+		err := c.DB.
+			Where("id=?", id).
+			Preload("Album").
+			Find(&track).
+			Error
+		if gorm.IsRecordNotFoundError(err) {
+			log.Printf("wasn't able to find track with id %d", id)
+			continue
+		}
+		resp.List[i] = spec.NewTCTrackByFolder(&track, track.Album)
+	}
+	return resp
+}
+
+func (c *Controller) ServeGetPlaylists(r *http.Request) *spec.Response {
+	user := r.Context().Value(CtxUser).(*db.User)
+	var playlists []*db.Playlist
+	c.DB.Where("user_id=?", user.ID).Find(&playlists)
+	sub := spec.NewResponse()
+	sub.Playlists = &spec.Playlists{
+		List: make([]*spec.Playlist, len(playlists)),
+	}
+	for i, playlist := range playlists {
+		sub.Playlists.List[i] = playlistRender(c, playlist)
+	}
+	return sub
+}
+
+func (c *Controller) ServeGetPlaylist(r *http.Request) *spec.Response {
+	params := r.Context().Value(CtxParams).(params.Params)
+	playlistID, err := params.GetFirstInt("id", "playlistId")
+	if err != nil {
+		return spec.NewError(10, "please provide an `id` parameter")
+	}
+	playlist := db.Playlist{}
+	err = c.DB.
+		Where("id=?", playlistID).
+		Find(&playlist).
+		Error
+	if gorm.IsRecordNotFoundError(err) {
+		return spec.NewError(70, "playlist with id `%d` not found", playlistID)
+	}
+	sub := spec.NewResponse()
+	sub.Playlist = playlistRender(c, &playlist)
+	return sub
+}
+
+func (c *Controller) ServeCreatePlaylist(r *http.Request) *spec.Response {
+	user := r.Context().Value(CtxUser).(*db.User)
+	params := r.Context().Value(CtxParams).(params.Params)
+	playlistID := params.GetFirstOrInt( /* default */ 0, "id", "playlistId")
+	// playlistID may be 0 from above. in that case we get a new playlist
+	// as intended
+	var playlist db.Playlist
+	c.DB.
+		Where("id=?", playlistID).
+		FirstOrCreate(&playlist)
+	// ** begin update meta info
+	playlist.UserID = user.ID
+	if val, err := params.Get("name"); err == nil {
+		playlist.Name = val
+	}
+	// ** begin replace song IDs
+	var trackIDs []int
+	if p, err := params.GetIDList("songId"); err == nil {
+		for _, i := range p {
+			trackIDs = append(trackIDs, i.Value)
+		}
+	}
+	// Set the items of the playlist
+	playlist.SetItems(trackIDs)
+	c.DB.Save(playlist)
+	//
+	sub := spec.NewResponse()
+	sub.Playlist = playlistRender(c, &playlist)
+	return sub
+}
+
+func (c *Controller) ServeUpdatePlaylist(r *http.Request) *spec.Response {
+	user := r.Context().Value(CtxUser).(*db.User)
+	params := r.Context().Value(CtxParams).(params.Params)
+	playlistID := params.GetFirstOrInt( /* default */ 0, "id", "playlistId")
+	// playlistID may be 0 from above. in that case we get a new playlist
+	// as intended
+	var playlist db.Playlist
+	c.DB.
+		Where("id=?", playlistID).
+		FirstOrCreate(&playlist)
+	// ** begin update meta info
+	playlist.UserID = user.ID
+	if val, err := params.Get("name"); err == nil {
+		playlist.Name = val
+	}
+	if val, err := params.Get("comment"); err == nil {
+		playlist.Comment = val
+	}
+	trackIDs := playlist.GetItems()
+	// ** begin delete items
+	if p, err := params.GetIntList("songIndexToRemove"); err == nil {
+		sort.Sort(sort.Reverse(sort.IntSlice(p)))
+		for _, i := range p {
+			trackIDs = append(trackIDs[:i], trackIDs[i+1:]...)
+		}
+	}
+	// ** begin add items
+	if p, err := params.GetIDList("songIdToAdd"); err == nil {
+		for _, i := range p {
+			trackIDs = append(trackIDs, i.Value)
+		}
+	}
+	//
+	playlist.SetItems(trackIDs)
+	c.DB.Save(playlist)
+	return spec.NewResponse()
+}
+
+func (c *Controller) ServeDeletePlaylist(r *http.Request) *spec.Response {
+	params := r.Context().Value(CtxParams).(params.Params)
+	c.DB.
+		Where("id=?", params.GetOrInt("id", 0)).
+		Delete(&db.Playlist{})
+	return spec.NewResponse()
+}