diff --git a/tests/test_parser.py b/tests/test_parser.py
index acb1f30..93de9db 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -67,6 +67,10 @@ def test_shortcuts(self):
         r = pp.parse("u2")
         assert r[0] == {"entity": "artist", "values": ["u2"], "weight": 1, "opts": []}
 
+        pp = PromptParser()
+        r = pp.parse("amy winehouse")
+        assert r[0] == {"entity": "artist", "values": ["amy winehouse"], "weight": 1, "opts": []}
+
     def test_compound(self):
         pp = PromptParser()
         r = pp.parse('artist:05319f96-e409-4199-b94f-3cabe7cc188a:2 tag:(downtempo):1 tag:(trip hop, abstract):2')
diff --git a/troi/playlist.py b/troi/playlist.py
index 5689e7a..4db5ada 100755
--- a/troi/playlist.py
+++ b/troi/playlist.py
@@ -23,6 +23,8 @@
 PLAYLIST_TRACK_EXTENSION_URI = "https://musicbrainz.org/doc/jspf#track"
 SUBSONIC_URI_PREFIX = "https://subsonic.org/entity/song/"
 
+# TODO: When resolving a playlist, insert "location" into existing playlist, don't create a new one
+#       Artist.mbids is totatlly stupid. We need [artists] with "join_phrase" in musicbrainz. Gah!
 
 def _serialize_to_jspf(playlist, created_for=None, track_count=None):
     """