diff --git a/Linker.py b/Linker.py
deleted file mode 100644
index 139597f..0000000
--- a/Linker.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/LocalLibrary.py b/LocalLibraryIndexer.py
similarity index 100%
rename from LocalLibrary.py
rename to LocalLibraryIndexer.py
diff --git a/ParseItunesToJson.py b/ParseItunesToJson.py
new file mode 100755
index 0000000..1505a36
--- /dev/null
+++ b/ParseItunesToJson.py
@@ -0,0 +1,101 @@
+import xmltodict
+import json
+
+
+def flatten_dict(d):
+
+    out = []
+    for song in d:
+        newSong = {}
+
+        strCount = 0
+        intCount = 0
+        dateCount = 0
+
+        def getStr(id):
+            nonlocal strCount
+            if id not in song["key"]:
+                return "undef"
+            if len(song["string"]) <= strCount:
+                return "error"
+            strCount += 1
+            return song["string"][strCount - 1]
+        
+        def getInt(id):
+            nonlocal intCount
+            if id not in song["key"]:
+                return -1
+            if len(song["integer"]) <= intCount:
+                return -1
+            intCount += 1
+            return song["integer"][intCount - 1]
+        
+        def getDate(id):
+            nonlocal dateCount
+            if id not in song["key"]:
+                return "undef"
+            if len(song["date"]) <= dateCount:
+                return "error"
+            dateCount += 1
+            return song["date"][dateCount - 1]
+        
+        newSong["Track ID"] = getInt("Track ID")
+        newSong["Name"] = getStr("Name")
+        newSong["Artist"] = getStr("Artist")
+        newSong["Album Artist"] = getStr("Album Artist")
+        newSong["Composer"] = getStr("Composer")
+        newSong["Album"] = getStr("Album")
+        newSong["Genre"] = getStr("Genre")
+        newSong["Kind"] = getStr("Kind")
+        newSong["Size"] = getInt("Size")
+        newSong["Total Time"] = getInt("Total Time")
+        newSong["Disc Number"] = getInt("Disc Number")
+        newSong["Disc Count"] = getInt("Disc Count")
+        newSong["Track Number"] = getInt("Track Number")
+        newSong["Track Count"] = getInt("Track Count")
+        newSong["Year"] = getInt("Year")
+        newSong["Date Modified"] = getDate("Date Modified")
+        newSong["Date Added"] = getDate("Date Added")
+        newSong["Bit Rate"] = getInt("Bit Rate")
+        newSong["Sample Rate"] = getInt("Sample Rate")
+        newSong["Play Count"] = getInt("Play Count")
+        newSong["Play Date"] = getInt("Play Date")
+        newSong["Play Date UTC"] = getDate("Play Date UTC")
+        newSong["Skip Count"] = getInt("Skip Count")
+        newSong["Skip Date"] = getDate("Skip Date")
+        newSong["Release Date"] = getDate("Release Date")
+        newSong["Album Rating"] = getInt("Album Rating")
+        newSong["Album Rating Computed"] = "Album Rating Computed" in song["key"]
+        newSong["Loved"] = "Loved" in song["key"]
+        newSong["Album Loved"] = "Album Loved" in song["key"]
+        newSong["Explicit"] = "Explicit" in song["key"]
+        newSong["Compilation"] = "Compilation" in song["key"]
+        newSong["Artwork Count"] = getInt("Artwork Count")
+        newSong["Sort Album"] = getStr("Sort Album")
+        newSong["Sort Artist"] = getStr("Sort Artist")
+        newSong["Sort Name"] = getStr("Sort Name")
+        newSong["Persistent ID"] = getStr("Persistent ID")
+        newSong["Track Type"] = getStr("Track Type")
+
+        out.append(newSong)
+
+    return out
+
+
+def convert(filename, out_path):
+    with open(filename, 'r', encoding='utf-8') as xml_file:
+        data_dict = xmltodict.parse(xml_file.read())
+
+    # Extract the "Tracks" dictionary to be flattened
+    tracks_dict = data_dict['plist']['dict']['dict']
+
+    flat_tracks_dict = flatten_dict(tracks_dict["dict"])
+
+    json_data = json.dumps(flat_tracks_dict, indent=2)
+
+    with open(out_path, 'w', encoding='utf-8') as json_file:
+        json_file.write(json_data)
+
+
+if __name__ == "__main__":
+    convert('./prefetched/ItunesLibrary.xml', './prefetched/ItunesLibrary.json')
diff --git a/env b/env
new file mode 100755
index 0000000..8955572
--- /dev/null
+++ b/env
@@ -0,0 +1,36 @@
+
+PS1=" > "
+
+#export PATH="/usr/local/bin/:$PATH"
+export PATH="$HOME/bin/scripts:$HOME/bin/:$PATH"
+#export PATH="$HOME/home/auser/.local/bin:$PATH"
+
+export SIP="185.238.170.251"
+
+alias v=nvim
+alias ll="ls -l -a"
+alias gl="git log --oneline"
+alias ssh_server="ssh auser@185.238.170.251"
+
+#eval "$(zoxide init bash --cmd zd)"
+
+#source $PMAIN/.scripts/bashmarks.sh
+
+fe() {
+  local result=$(command tere "$@")
+  [ -n "$result" ] && cd -- "$result"
+}
+
+vim_configure() {
+	pwd=$(pwd)
+	cd ~/.config/nvim/
+	nvim
+	cd $pwd
+}
+
+pyenv() {
+	source ~/bin/python/env311/bin/activate
+}
+
+source ~/src/scripts/remotes.sh
+source /usr/share/fzf/key-bindings.bash
diff --git a/main.py b/main.py
index 6e04234..204c0ab 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,5 @@
 from DataBase import *
-from SpotifyWebAPI import fetch_data
+from SpotifyWebAPI import fetch_data, update_access_token
 import cmd
 
 playlists = get_data('playlistTracks')
@@ -167,6 +167,7 @@ class Interpreter(cmd.Cmd):
     def do_fetch(self, arg):
         """Fetch all spotify data"""
         try:
+            update_access_token()
             fetch_data()
 
             global playlists, top_artists, top_tracks, user_tracks