diff --git a/scrape.py b/scrape.py
index 0e174f1..2194772 100755
--- a/scrape.py
+++ b/scrape.py
@@ -48,6 +48,9 @@ class User:
     following_count = None
     follower_count = None
 
+    tracks = []
+    likes = []
+
 class Track:
     title = None
     artist = None
@@ -176,7 +179,8 @@ def Get_Tracks_Info(url, limit = 100):
 
         print('    ' + track.artist + ' - ' + track.title)
 
-    return tracks
+    # Strip off keys and return a track list
+    return tracks.values()
 
 user_dict = {}
 users_to_process = ['thomotron', 'lacheque', 'slynk', 'bossfightswe']
@@ -215,5 +219,5 @@ for _, user in user_dict.items():
     print('  Following ' + str(user.following_count))
     print('  Followed by ' + str(user.follower_count))
     print('  Tracks:')
-    for _, track in user.tracks.items():
-        print('    ' + track.title)
+    for track in user.tracks:
+        print('    ' + str(track.title))