diff --git a/cmd/find.go b/cmd/find.go
index 44cce00..73a53f5 100644
--- a/cmd/find.go
+++ b/cmd/find.go
@@ -21,10 +21,9 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		conn, _ := mpd.GetConn()
-		ret, _ := conn.Search(args...)
-		for _, attr := range ret {
-			for k, v := range attr {
+		ret, _ := mpd.Find(args...)
+		for _, song := range ret {
+			for k, v := range song.Attrs {
 				fmt.Println(k, ":", v)
 			}
 			fmt.Println("-------")
diff --git a/go.mod b/go.mod
index 95ff5db..f94f952 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,7 @@ module codeberg.org/danjones000/mpc-extra
 go 1.20
 
 require (
+	github.com/akrennmair/slice v0.0.0-20220105203817-49445747ab81
 	github.com/fhs/gompd/v2 v2.3.0
 	github.com/spf13/cobra v1.7.0
 )
diff --git a/go.sum b/go.sum
index b6552d2..543371f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,12 +1,18 @@
+github.com/akrennmair/slice v0.0.0-20220105203817-49445747ab81 h1:HnuAxArB0uUxqjRvZdjhBxE3uPXNeJvNNbuaV4QhHMU=
+github.com/akrennmair/slice v0.0.0-20220105203817-49445747ab81/go.mod h1:jk5mJ+KFznfxbCEsOPgmJkozvBfVGeaqIMs31NhXlv0=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/fhs/gompd/v2 v2.3.0 h1:wuruUjmOODRlJhrYx73rJnzS7vTSXSU7pWmZtM3VPE0=
 github.com/fhs/gompd/v2 v2.3.0/go.mod h1:nNdZtcpD5VpmzZbRl5rV6RhxeMmAWTxEsSIMBkmMIy4=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/mpd/find.go b/mpd/find.go
new file mode 100644
index 0000000..9729bc1
--- /dev/null
+++ b/mpd/find.go
@@ -0,0 +1,16 @@
+package mpd
+
+import "github.com/akrennmair/slice"
+
+func Find(args ...string) ([]*Song, error) {
+	if connerror != nil {
+		return nil, connerror
+	}
+
+	songs, err := conn.Search(args...)
+	if err != nil {
+		return nil, err
+	}
+
+	return slice.Map(songs, newSong), nil
+}
diff --git a/mpd/song.go b/mpd/song.go
index 64111f5..aa3c0f8 100644
--- a/mpd/song.go
+++ b/mpd/song.go
@@ -29,5 +29,3 @@ func (s *Song) GetStickers() ([]mpd.Sticker, error) {
 
 	return s.stickers, err
 }
-
-// github.com/akrennmair/slice