diff --git a/MiniSpotify/MiniSpotify/App.config b/MiniSpotify/MiniSpotify/App.config
index 56efbc7..92691b0 100644
--- a/MiniSpotify/MiniSpotify/App.config
+++ b/MiniSpotify/MiniSpotify/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/MiniSpotify/MiniSpotify/MainWindow.xaml b/MiniSpotify/MiniSpotify/MainWindow.xaml
index 0e866bb..4b0a383 100644
--- a/MiniSpotify/MiniSpotify/MainWindow.xaml
+++ b/MiniSpotify/MiniSpotify/MainWindow.xaml
@@ -95,7 +95,8 @@
                 BorderBrush="{x:Null}"
                 BorderThickness="0"
                 Foreground="#FF1DB954"
-                Value="0" />
+                Value="0"
+                Maximum="1" />
             <Button
                 Name="LikeSongButton"
                 Width="16"
diff --git a/MiniSpotify/MiniSpotify/MiniSpotify.csproj b/MiniSpotify/MiniSpotify/MiniSpotify.csproj
index 2f0969d..fe4c3ad 100644
--- a/MiniSpotify/MiniSpotify/MiniSpotify.csproj
+++ b/MiniSpotify/MiniSpotify/MiniSpotify.csproj
@@ -66,15 +66,6 @@
     <ApplicationIcon>NoteMW.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SpotifyAPI.Web, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpotifyAPI.Web.4.1.1\lib\net46\SpotifyAPI.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="SpotifyAPI.Web.Auth, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpotifyAPI.Web.Auth.4.1.0\lib\net46\SpotifyAPI.Web.Auth.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -87,12 +78,6 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="Unosquare.Labs.EmbedIO, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EmbedIO.2.2.7\lib\net472\Unosquare.Labs.EmbedIO.dll</HintPath>
-    </Reference>
-    <Reference Include="Unosquare.Swan.Lite, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unosquare.Swan.Lite.0.38.1\lib\net452\Unosquare.Swan.Lite.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -102,13 +87,15 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Source\APIRequestor.cs" />
+    <Compile Include="MiniSpotifyConfig.cs" />
     <Compile Include="Source\App.xaml.cs" />
     <Compile Include="Source\EditorWindow.xaml.cs" />
     <Compile Include="Source\Helpers\FileHelper.cs" />
     <Compile Include="Source\Helpers\LerpEaser.cs" />
-    <Compile Include="Source\Interfaces\IAPIRequestor.cs" />
+    <Compile Include="Source\Interfaces\ISpotifyService.cs" />
     <Compile Include="Source\MainWindow.xaml.cs" />
+    <Compile Include="Source\Impl\SpotifyService.cs" />
+    <Compile Include="Source\VO\ContextualUpdateVO.cs" />
     <Page Include="EditorWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -136,7 +123,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -226,5 +212,16 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>13.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SpotifyAPI.Web.Auth">
+      <Version>6.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="TinYard">
+      <Version>1.3.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/MiniSpotify/MiniSpotify/Source/APIRequestor.cs b/MiniSpotify/MiniSpotify/Source/APIRequestor.cs
deleted file mode 100644
index c1b22b0..0000000
--- a/MiniSpotify/MiniSpotify/Source/APIRequestor.cs
+++ /dev/null
@@ -1,448 +0,0 @@
-using Microsoft.Win32;
-using MiniSpotify.API.Base;
-using MiniSpotify.HelperScripts;
-using SpotifyAPI.Web;
-using SpotifyAPI.Web.Auth;
-using SpotifyAPI.Web.Enums;
-using SpotifyAPI.Web.Models;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Sockets;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace MiniSpotify.API.Impl
-{
-    public class APIRequestor : IAPIRequestor
-    {
-        private static APIRequestor m_instance = null;
-        public static APIRequestor Instance
-        {
-            get
-            {
-                if (m_instance == null)//If no instance is set, create one.
-                {
-                    m_instance = new APIRequestor();
-                }
-
-                return m_instance;
-            }
-        }
-
-        private Task m_pollingTask;
-
-        private FullTrack m_latestTrack;
-
-        public Action<FullTrack> m_onSongChanged;
-        public Action<FullTrack> m_onAuthComplete;
-        public Action<FullTrack> m_onAPIPolled;
-
-        private int m_songChangePollDelayMS = /*10000*/1000;//1 second
-
-        private string m_baseURL = default;
-        private string m_authURL = default;
-
-        private string m_clientID = "93f2598a9eaf4056b34f7b5ca254ff17";
-        private string m_clientSecret = "";
-        private string m_clientSecretPath = "\\Assets\\Files\\ClientSecret.txt";
-
-        private string m_albumimage = "";
-
-        //https://developer.spotify.com/documentation/general/guides/scopes/
-        private Scope m_accessScopes = Scope.UserModifyPlaybackState | Scope.Streaming | Scope.UserReadRecentlyPlayed | Scope.UserReadCurrentlyPlaying | Scope.UserReadPlaybackState | Scope.UserLibraryModify | Scope.UserLibraryRead;
-        private HttpClient m_webClient;
-        private static SpotifyWebAPI m_spotifyWebAPI;
-        private Token m_authToken;
-
-        public void Initialise()
-        {
-            m_instance = new APIRequestor();
-
-            //string secret = FileHelper.GetFileText(m_clientSecretPath);
-            //if (!string.IsNullOrEmpty(secret))
-            //{
-            //    m_instance.m_clientSecret = secret;
-            //}
-
-            AuthAPI();
-        }
-
-        private async void AuthAPI()
-        {
-            //Source:
-            //https://github.com/JohnnyCrazy/SpotifyAPI-NET
-            //https://johnnycrazy.github.io/SpotifyAPI-NET/auth/implicit_grant.html
-
-            if (m_instance.m_authToken == null || m_instance.m_authToken.IsExpired())
-            {
-                string redirectURI = "http://localhost:4002";
-
-                ImplicitGrantAuth auth = new ImplicitGrantAuth(
-                        m_instance.m_clientID,
-                        redirectURI,
-                        redirectURI,
-                        m_accessScopes);
-
-                auth.AuthReceived += async (sender, payload) =>
-                {
-                    auth.Stop(); // `sender` is also the auth instance
-                    
-                    m_instance.m_authToken = payload;
-
-                    m_spotifyWebAPI = new SpotifyWebAPI()
-                    {
-                        TokenType = m_instance.m_authToken.TokenType,
-                        AccessToken = m_instance.m_authToken.AccessToken,
-                        UseAuth = true
-                    };
-                    
-                    m_instance.m_pollingTask = Task.Run(PollSongChange);//Start the song change polling
-                };
-
-                auth.Start();//Starts an internal http server
-                auth.OpenBrowser();//Opens browser to authenticate app
-            }
-        }
-
-        public void Close()
-        {
-            //Dispose of anything we need to
-            if (m_instance.m_webClient != null)
-            {
-                m_instance.m_webClient.Dispose();
-                m_instance.m_webClient = null;
-            }
-
-            if (m_pollingTask != null)
-            {
-                m_pollingTask.Dispose();
-                m_pollingTask = null;
-            }
-
-            if(m_spotifyWebAPI != null)
-            {
-                m_spotifyWebAPI.Dispose();
-                m_spotifyWebAPI = null;
-            }
-
-        }
-
-        public bool ModifyLike() //Return true if the song becomes liked. False otherwise.
-        {
-            FullTrack currentTrack = m_instance.GetLatestTrack();
-
-            if (currentTrack != null)
-            {
-                List<string> currentID = new List<string> { currentTrack.Id };
-
-                List<bool> list = m_spotifyWebAPI.CheckSavedTracks(currentID).List;
-
-                if (list.Count == 1)
-                {
-                    if (list[0]) // If liked, dislike.
-                    {
-                        m_spotifyWebAPI.RemoveSavedTracks(currentID);
-                        return false;
-                    }
-                    else // If disliked, like.
-                    {
-                        m_spotifyWebAPI.SaveTracks(currentID);
-                        return true;
-                    }
-                }
-                else
-                    return false;
-            }
-            else
-                return false;
-        }
-
-        public void ModifyPlayback()
-        {
-            //See if they're already listening to music.
-            if (m_spotifyWebAPI.GetPlayingTrack().IsPlaying)
-            {
-                //Already listening to music, we'll modify and pause it
-                ErrorResponse e = m_spotifyWebAPI.PausePlayback();
-
-                if (e.HasError())
-                {
-                    Console.WriteLine(e.Error.Message);
-                }
-            }
-            else
-            {
-                //Not currently listening, so let's get it resumed
-                //Get their last played track
-                CursorPaging<PlayHistory> history = m_spotifyWebAPI.GetUsersRecentlyPlayedTracks();
-                if (history.HasError())
-                {
-                    Console.WriteLine(history.Error.ToString());
-                }
-                else if (history.Items.Count > 0)
-                {
-                    //By not setting any variables, we continue playback from the last playlist, with the 
-                    //last song listened to. 
-                    ErrorResponse e = m_spotifyWebAPI.ResumePlayback("", "", null, "", 0);
-                    if (e.HasError())
-                    {
-                        Console.WriteLine(e.Error.Message);
-
-                        if (e.Error.Status == 404)
-                        {
-                            List<Device> devices = m_spotifyWebAPI.GetDevices().Devices;
-
-                            for (int i = 0; i < devices.Count; i++)
-                            {
-                                if (devices[i].IsRestricted == false)
-                                {
-                                    m_spotifyWebAPI.ResumePlayback(devices[i].Id, "", null, "", 0);
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        //Let whatever wants to know that the song has 'changed'.
-                        //Because technically it hasn't, our polling method won't pick this up.
-                        //But anything wanting to know about this, won't be told there's a song playing 
-                        //so we'll trigger this ourself.
-                        FullTrack lastSong = m_spotifyWebAPI.GetPlayingTrack().Item;
-                        m_instance.m_onSongChanged.Invoke(lastSong);
-
-                    }
-                }
-            }
-        }
-
-        public bool SkipSongPlayback(bool a_nextSong = true)
-        {
-            //See if they're already listening to music.
-            if (m_spotifyWebAPI.GetPlayingTrack().IsPlaying)
-            {
-                if (a_nextSong)
-                {
-                    try
-                    {
-                        m_spotifyWebAPI.SkipPlaybackToNext();
-                    }
-                    catch (ArgumentException e) // Spammed the button before the system could register it as event
-                    {
-                        Console.WriteLine(e.StackTrace);
-                    }
-                }
-                else
-                {
-                    try
-                    {
-                        m_spotifyWebAPI.SkipPlaybackToPrevious();
-                    }
-                    catch (ArgumentException e) // Spammed the button before the system could register it as event
-                    {
-                        Console.WriteLine(e.StackTrace);
-                    }
-                }
-
-                FullTrack latestSong = m_spotifyWebAPI.GetPlayback().Item;
-                m_instance.m_onSongChanged.Invoke(latestSong);
-
-                return true;
-            }
-            return false;
-        }
-
-        public string GetSongArtwork(string a_trackID)
-        {
-            if (m_spotifyWebAPI != null && !string.IsNullOrEmpty(a_trackID))
-            {
-                return m_spotifyWebAPI.GetTrack(a_trackID).Album.Images[0].Url;
-            }
-
-            return null;
-        }
-        public string GetCurrentSongArtwork()
-        {
-            string imageURL = null;
-
-            if (m_spotifyWebAPI != null && m_spotifyWebAPI.GetPlayback().IsPlaying)
-            {
-                if (!m_spotifyWebAPI.GetPlayingTrack().HasError())
-                {
-                    try
-                    {
-                        imageURL = m_spotifyWebAPI.GetPlayingTrack().Item.Album.Images[0].Url;
-                        m_albumimage = imageURL; //Set it as 'backup'
-                    }
-                    catch (Exception e) // Returned a hard null and not normal null
-                    {
-                        //Use backup image
-                        if (m_albumimage != null)
-                            imageURL = m_albumimage;
-
-                        Console.WriteLine(e.StackTrace);
-                    }
-                }
-                else if (m_albumimage != null)
-                {
-                    //Use backup image
-                    imageURL = m_albumimage;
-                }
-            }
-
-            return imageURL;
-        }
-
-        public FullTrack GetLatestTrack()
-        {
-            if (m_spotifyWebAPI != null)
-            {
-                if (m_spotifyWebAPI.GetPlayback().IsPlaying || m_spotifyWebAPI.GetPlayingTrack().Item != null)
-                {
-                    return m_spotifyWebAPI.GetPlayingTrack().Item;
-                }
-                else
-                {
-                    FullTrack latestTrack = m_spotifyWebAPI.GetPlayingTrack().Item;
-                    if (latestTrack != null)
-                    {
-                        return latestTrack;
-                    }
-                    else if (m_spotifyWebAPI.GetUsersRecentlyPlayedTracks().Error == null)
-                    {
-                        CursorPaging<PlayHistory> history = m_spotifyWebAPI.GetUsersRecentlyPlayedTracks();
-                        return m_spotifyWebAPI.GetTrack(history.Items[0].Track.Id);
-                    }
-                }
-            }
-            return null;
-        }
-
-        public float GetLatestSongProgress()
-        {
-            if (m_spotifyWebAPI != null)
-            {
-                try
-                {
-                    FullTrack currentTrack = Instance.GetLatestTrack();
-                    float progress = (float)m_spotifyWebAPI.GetPlayback().ProgressMs / (float)currentTrack.DurationMs;
-                    return progress;
-                }
-                catch (NullReferenceException e) //Unexpected spotify closed
-                {
-                    Console.WriteLine(e.StackTrace);
-                    return -1;
-                }
-            }
-            else
-                return -1;
-        }
-
-        public bool GetSongIsLiked()
-        {
-            if (m_spotifyWebAPI != null)
-            {
-                try
-                {
-                    FullTrack currentTrack = Instance.GetLatestTrack();
-
-                    List<string> toCheck = new List<string> { currentTrack.Id };
-
-                    return m_spotifyWebAPI.CheckSavedTracks(toCheck).List[0];
-                }
-                catch (NullReferenceException e) //Unexpected spotify closed
-                {
-                    Console.WriteLine(e.StackTrace);
-                    return false;
-                }
-            }
-
-            return false;
-        }
-
-        public bool GetIsPlaying()
-        {
-            if (m_spotifyWebAPI != null)
-            {
-                return m_spotifyWebAPI.GetPlayback().IsPlaying;
-            }
-
-            return false;
-        }
-
-        public string GetPlaybackContext()
-        {
-            string InvalidReturn = string.Empty;
-
-            if (m_spotifyWebAPI != null)
-            {
-                Context context = m_spotifyWebAPI.GetPlayback().Context;
-
-                if (context == null)
-                {
-                    return InvalidReturn;
-                }
-                else
-                {
-                    if (string.IsNullOrWhiteSpace(context.Type))
-                    {
-                        return InvalidReturn;
-                    }
-                    else
-                    {
-                        string id = context.Uri.Split(':').Last();
-
-                        switch (context.Type)
-                        {
-                            case "album":
-                                return m_spotifyWebAPI.GetAlbum(id).Name;
-                            case "artist":
-                                return m_spotifyWebAPI.GetArtist(id).Name;
-                            case "playlist":
-                                return m_spotifyWebAPI.GetPlaylist(id).Name;
-                            default:
-                                return InvalidReturn;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                return InvalidReturn;
-            }
-        }
-
-        private async void PollSongChange()
-        {
-            while (m_spotifyWebAPI != null)
-            {
-                FullTrack currentTrack = m_instance.GetLatestTrack();
-
-                if (currentTrack != null)
-                {
-                    if (m_instance.m_latestTrack == null)
-                    {
-                        m_instance.m_onSongChanged(currentTrack);
-                    }
-                    else if (currentTrack != m_instance.m_latestTrack)
-                    {
-                        m_instance.m_onSongChanged(currentTrack);
-                        m_instance.m_latestTrack = currentTrack;
-                    }
-
-                    m_instance.m_onAPIPolled(currentTrack);
-                }
-
-                //Update for next time.
-                m_instance.m_latestTrack = m_instance.GetLatestTrack();
-
-                await Task.Delay(m_songChangePollDelayMS);
-            }
-        }
-    }
-}
diff --git a/MiniSpotify/MiniSpotify/Source/App.xaml.cs b/MiniSpotify/MiniSpotify/Source/App.xaml.cs
index 3e0dbec..5661607 100644
--- a/MiniSpotify/MiniSpotify/Source/App.xaml.cs
+++ b/MiniSpotify/MiniSpotify/Source/App.xaml.cs
@@ -1,11 +1,10 @@
-using MiniSpotify.API.Impl;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
+using MiniSpotify.Source.Interfaces;
 using System.Windows;
+using System.Windows.Navigation;
+using TinYard;
+using TinYard.API.Interfaces;
+using TinYard.Extensions.Bundles;
+using TinYard.Extensions.CallbackTimer;
 
 namespace MiniSpotify
 {
@@ -14,15 +13,33 @@ namespace MiniSpotify
     /// </summary>
     public partial class App : Application
     {
+        private IContext _context;
+
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
 
-            APIRequestor.Instance.Initialise();
+            _context = new Context();
+            _context
+                .Install(new MVCBundle())
+                .Install(new CallbackTimerExtension())
+                .Configure(new MiniSpotifyConfig()
+                .OnServiceConnected(OnServiceReady));
+            
+            _context.Initialize();
+
+        }
+
+        private void OnServiceReady()
+        {
+            var window = MainWindow as MainWindow;
+            _context.Injector.Inject(window);
+            window.Setup();
         }
+
         private void Application_Exit(object sender, ExitEventArgs e)
         {
-            APIRequestor.Instance.Close();
+            _context.Mapper.GetMappingValue<ISpotifyService>()?.Disconnect();
         }
     }
 }
diff --git a/MiniSpotify/MiniSpotify/Source/Helpers/FileHelper.cs b/MiniSpotify/MiniSpotify/Source/Helpers/FileHelper.cs
index 88eaa4b..e378fe1 100644
--- a/MiniSpotify/MiniSpotify/Source/Helpers/FileHelper.cs
+++ b/MiniSpotify/MiniSpotify/Source/Helpers/FileHelper.cs
@@ -1,10 +1,5 @@
-using MiniSpotify.API.Base;
-using System;
-using System.Collections.Generic;
+using System;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniSpotify.HelperScripts
 {
diff --git a/MiniSpotify/MiniSpotify/Source/Interfaces/IAPIRequestor.cs b/MiniSpotify/MiniSpotify/Source/Interfaces/IAPIRequestor.cs
deleted file mode 100644
index c695c36..0000000
--- a/MiniSpotify/MiniSpotify/Source/Interfaces/IAPIRequestor.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniSpotify.API.Base
-{
-    public interface IAPIRequestor
-    {
-        void Initialise();
-        void Close();
-    }
-}
diff --git a/MiniSpotify/MiniSpotify/Source/MainWindow.xaml.cs b/MiniSpotify/MiniSpotify/Source/MainWindow.xaml.cs
index 443db20..8db75d8 100644
--- a/MiniSpotify/MiniSpotify/Source/MainWindow.xaml.cs
+++ b/MiniSpotify/MiniSpotify/Source/MainWindow.xaml.cs
@@ -1,6 +1,4 @@
-using MiniSpotify.API.Impl;
-using SpotifyAPI.Web.Models;
-using System;
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
@@ -11,6 +9,10 @@
 using System.Windows.Media.Imaging;
 using ColorConverter = System.Windows.Media.ColorConverter;
 using Color = System.Windows.Media.Color;
+using MiniSpotify.Source.Interfaces;
+using TinYard.Framework.Impl.Attributes;
+using SpotifyAPI.Web;
+using MiniSpotify.Source.VO;
 
 namespace MiniSpotify
 {
@@ -19,6 +21,10 @@ namespace MiniSpotify
     /// </summary>
     public partial class MainWindow : Window
     {
+        [Inject]
+        public ISpotifyService Service { get; private set; }
+        
+        private FullTrack _latestSong;
         private bool m_pinnedToTop = true;
 
         private bool m_editWindowOpen = false;
@@ -32,123 +38,66 @@ public MainWindow()
             editWindow = new EditorWindow();
             editWindow.Hide();
 
-            APIRequestor.Instance.m_onSongChanged += OnSongChanged;
-            APIRequestor.Instance.m_onAuthComplete += UpdateUI;
-            APIRequestor.Instance.m_onAPIPolled += UpdateUI;
-
             LocationChanged += UpdateEditWindowPosition;
-
-            Closing += (e, f) => APIRequestor.Instance.Close();
         }
 
-        public void UpdateUI(FullTrack a_latestTrack = null)
+        public void Setup()
         {
-            bool liked = APIRequestor.Instance.GetSongIsLiked();
-            UpdateLikeIcon(liked);
-
-            bool playing = APIRequestor.Instance.GetIsPlaying();
-            UpdatePlayIcon(playing);
+            Service.OnPlaybackUpdated += OnPlaybackUpdated;
+            Closing += (e, f) => Service.Disconnect();
+        }
 
-            float progress = APIRequestor.Instance.GetLatestSongProgress();
-            UpdateProgressBar(progress);
+        private void OnPlaybackUpdated(ContextualUpdateVO playingContext)
+        {
+            UpdateProgressBar(playingContext.latestSongProgress);
+            UpdatePlayIcon(playingContext.IsSongPlaying);
+            UpdateLikeIcon(playingContext.IsSongLiked);
 
-            string artworkURL = APIRequestor.Instance.GetCurrentSongArtwork();
-            if (string.IsNullOrEmpty(artworkURL))
+            //We don't need to update these every time
+            if(_latestSong != playingContext.LatestSong)
             {
-                Console.WriteLine("No track playing. Getting last track.");
-                try
-                {
-                    if (APIRequestor.Instance.GetLatestTrack().Id != null)
-                    {
-                        artworkURL = APIRequestor.Instance.GetLatestTrack().Id;//Get the track ID
-                    }
-                }catch(NullReferenceException e)// ID returned a hard null and not normal null
-                {
-                    Console.WriteLine(e.StackTrace);
-                    artworkURL = null;
-                }
-                artworkURL = APIRequestor.Instance.GetSongArtwork(artworkURL);//Get the artwork url
-            }
+                UpdateDisplayImage(playingContext.LatestSongArtworkURL);
+                UpdateTrackName(playingContext.LatestSong);
+                UpdateArtists(playingContext.LatestSong);
+                UpdatePlaybackContext(playingContext.PlaybackContext);
 
-            if(!string.IsNullOrEmpty(artworkURL))
-            {
-                UpdateDisplayImage(artworkURL);
-            }
-
-            if(a_latestTrack == null)
-            {
-                a_latestTrack = APIRequestor.Instance.GetLatestTrack();
-            }
-
-            if(a_latestTrack != null)
-            {
-                string trackName = a_latestTrack.Name;
-                string artists = a_latestTrack.Artists[0].Name;
-                string context = APIRequestor.Instance.GetPlaybackContext();
-
-                for (int i = 1; i < a_latestTrack.Artists.Count; i++)
-                {
-                    artists = string.Concat(artists, ", ", a_latestTrack.Artists[i].Name);
-                }
-
-                this.Dispatcher.Invoke(() =>
-                {
-                    //Update any UI in this block.
-                    TitleText.Text = a_latestTrack.Name;
-                    ArtistText.Text = artists;
-                    ContextText.Text = context;
-                });
+                _latestSong = playingContext.LatestSong;
             }
         }
 
-        private void OnSongChanged(FullTrack a_latestTrackPlaying)
+        private void UpdatePlaybackContext(string playbackContext)
         {
-            string artworkURL = APIRequestor.Instance.GetCurrentSongArtwork();
-            if (string.IsNullOrEmpty(artworkURL))
-            {
-                Console.WriteLine("No track playing. Cannot update image.");
-            }
-            else
-            {
-                UpdateDisplayImage(artworkURL);
-            }
-
-            string trackName = a_latestTrackPlaying.Name;
-            string artists = a_latestTrackPlaying.Artists[0].Name;
-            string context = APIRequestor.Instance.GetPlaybackContext();
-
-            for (int i = 1; i < a_latestTrackPlaying.Artists.Count; i++)
-            {
-                artists = string.Concat(artists, ", ", a_latestTrackPlaying.Artists[i].Name);
-            }
-
             this.Dispatcher.Invoke(() =>
             {
-                //Update any UI in this block.
-                TitleText.Text = a_latestTrackPlaying.Name;
-                ArtistText.Text = artists;
-                ContextText.Text = context;
+                ContextText.Text = playbackContext;
             });
         }
 
         public void OnClickLike(object a_sender, RoutedEventArgs a_args)
         {
-            UpdateLikeIcon(APIRequestor.Instance.ModifyLike());
+            Service.ToggleLikeCurrentSong();
         }
 
         public void OnClickPlayPause(object a_sender, RoutedEventArgs a_args)
         {
-            APIRequestor.Instance.ModifyPlayback();//Returns true if now playing, else false
-            UpdatePlayIcon(APIRequestor.Instance.GetIsPlaying());
+            Service.TogglePlayingStatus();
         }
 
         public void OnClickNextSong(object a_sender, RoutedEventArgs a_args)
         {
-            APIRequestor.Instance.SkipSongPlayback(true);
+            Service.PlayNextSong();
         }
+
         public void OnClickPreviousSong(object a_sender, RoutedEventArgs a_args)
         {
-            APIRequestor.Instance.SkipSongPlayback(false);
+            if(SongProgress.Value > 0f)
+            {
+                Service.RestartCurrentSong();
+            }
+            else
+            {
+                Service.PlayPreviousSong();
+            }
         }
 
         public void OnClickEditorButton(object a_sender, RoutedEventArgs a_args)
@@ -187,48 +136,46 @@ public void OnClickEditorButton(object a_sender, RoutedEventArgs a_args)
             }
         }
 
-        private async void UpdateDisplayImage(string a_artworkURL)
+        private async void UpdateDisplayImage(string artworkUrl)
         {
-            if (!string.IsNullOrEmpty(a_artworkURL))
-            {
-                Uri artworkAbsURI = new Uri(a_artworkURL, UriKind.Absolute);
+            if (string.IsNullOrWhiteSpace(artworkUrl))
+                return;
 
-                WebRequest request = WebRequest.Create(artworkAbsURI);
-                WebResponse response = await request.GetResponseAsync();
+            Uri artworkAbsURI = new Uri(artworkUrl, UriKind.Absolute);
 
-                Stream responseStream = response.GetResponseStream();
+            WebRequest request = WebRequest.Create(artworkAbsURI);
+            WebResponse response = await request.GetResponseAsync();
 
-                Bitmap art = new Bitmap(responseStream);
-                BitmapImage bmpImage = new BitmapImage();
+            Stream responseStream = response.GetResponseStream();
 
-                using (MemoryStream memory = new MemoryStream())
-                {
-                    art.Save(memory, ImageFormat.Png);
-                    memory.Position = 0;
-                    bmpImage.BeginInit();
-                    bmpImage.StreamSource = memory;
-                    bmpImage.DecodePixelWidth = 512;
-                    bmpImage.DecodePixelHeight = 512;
-                    bmpImage.CacheOption = BitmapCacheOption.OnLoad;
-                    bmpImage.EndInit();
-                }
-
-                bmpImage.Freeze();
-                this.Dispatcher.Invoke(() =>
-                {
-                    //Update any UI in this block.
-                    AlbumArtworkImage.Source = bmpImage;
-                });
+            Bitmap art = new Bitmap(responseStream);
+            BitmapImage bmpImage = new BitmapImage();
 
+            using (MemoryStream memory = new MemoryStream())
+            {
+                art.Save(memory, ImageFormat.Png);
+                memory.Position = 0;
+                bmpImage.BeginInit();
+                bmpImage.StreamSource = memory;
+                bmpImage.DecodePixelWidth = 512;
+                bmpImage.DecodePixelHeight = 512;
+                bmpImage.CacheOption = BitmapCacheOption.OnLoad;
+                bmpImage.EndInit();
             }
+
+            bmpImage.Freeze();
+            this.Dispatcher.Invoke(() =>
+            {
+                //Update any UI in this block.
+                AlbumArtworkImage.Source = bmpImage;
+            });
         }
 
-        private void UpdateProgressBar(float a_progress)
+        private void UpdateProgressBar(float progress)
         {
-            a_progress = 100 * a_progress;//a_progress is normalized between 0-1, *100 so that it's between 0 - 100
             this.Dispatcher.Invoke(() =>
             {
-                SongProgress.Value = a_progress;
+                SongProgress.Value = progress;
             });
         }
 
@@ -279,6 +226,29 @@ private void UpdatePlayIcon(bool a_isPlaying)
                 }
             });
         }
+
+        private void UpdateTrackName(FullTrack a_latestTrackPlaying)
+        {
+            string trackName = a_latestTrackPlaying.Name;
+            this.Dispatcher.Invoke(() =>
+            {
+                TitleText.Text = a_latestTrackPlaying.Name;
+            });
+        }
+
+        private void UpdateArtists(FullTrack a_latestTrackPlaying)
+        {
+            string artists = a_latestTrackPlaying.Artists[0].Name;
+            for (int i = 1; i < a_latestTrackPlaying.Artists.Count; i++)
+            {
+                artists = string.Concat(artists, ", ", a_latestTrackPlaying.Artists[i].Name);
+            }
+            this.Dispatcher.Invoke(() =>
+            {
+                ArtistText.Text = artists;
+            });
+        }
+
         private void UpdateEditWindowPosition(object sender, EventArgs e)
         {
             double mainWidth = RootWindow.ActualWidth;
diff --git a/MiniSpotify/MiniSpotify/packages.config b/MiniSpotify/MiniSpotify/packages.config
deleted file mode 100644
index 42d8063..0000000
--- a/MiniSpotify/MiniSpotify/packages.config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EmbedIO" version="2.2.7" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
-  <package id="SpotifyAPI.Web" version="4.1.1" targetFramework="net472" />
-  <package id="SpotifyAPI.Web.Auth" version="4.1.0" targetFramework="net472" />
-  <package id="Unosquare.Swan.Lite" version="0.38.1" targetFramework="net472" />
-</packages>
\ No newline at end of file