diff --git a/MPfm/MPfm.Android/Classes/Activities/SyncCloudActivity.cs b/MPfm/MPfm.Android/Classes/Activities/SyncCloudActivity.cs
index f7b79faf..ed3526d3 100644
--- a/MPfm/MPfm.Android/Classes/Activities/SyncCloudActivity.cs
+++ b/MPfm/MPfm.Android/Classes/Activities/SyncCloudActivity.cs
@@ -35,7 +35,6 @@ namespace MPfm.Android
     public class SyncCloudActivity : BaseActivity, ISyncCloudView
     {
         private MobileNavigationManager _navigationManager;
-        private ICloudLibraryService _cloudLibrary;
         private TextView _lblConnected;
         private TextView _lblDataChanged;
         private TextView _lblValue;
@@ -50,9 +49,6 @@ protected override void OnCreate(Bundle bundle)
             Console.WriteLine("SyncCloudActivity - OnCreate");
             base.OnCreate(bundle);
 
-            _cloudLibrary = Bootstrapper.GetContainer().Resolve<ICloudLibraryService>();
-            _cloudLibrary.OnCloudDataChanged += OnCloudLibraryDataChanged;
-
             _navigationManager = Bootstrapper.GetContainer().Resolve<MobileNavigationManager>();
             SetContentView(Resource.Layout.SyncCloud);
             ActionBar.SetDisplayHomeAsUpEnabled(true);
@@ -66,113 +62,12 @@ protected override void OnCreate(Bundle bundle)
             _btnPull = FindViewById<Button>(Resource.Id.syncCloud_btnPull);
             _btnPush = FindViewById<Button>(Resource.Id.syncCloud_btnPush);
             _btnDelete = FindViewById<Button>(Resource.Id.syncCloud_btnDelete);
-            _btnLogin.Click += BtnLoginOnClick;
-            _btnLogout.Click += BtnLogoutOnClick;
-            _btnPull.Click += BtnPullOnClick;
-            _btnPush.Click += BtnPushOnClick;
-            _btnDelete.Click += BtnDeleteOnClick;
-            
-            //_lblConnected.Text = string.Format("Is Linked: {0} {1}", _accountManager.HasLinkedAccount, DateTime.Now.ToLongTimeString());
-            _lblConnected.Text = string.Format("Is Linked: {0} {1}", _cloudLibrary.HasLinkedAccount, DateTime.Now.ToLongTimeString());
 
             // Since the onViewReady action could not be added to an intent, tell the NavMgr the view is ready
             //((AndroidNavigationManager)_navigationManager).SetSyncCloudActivityInstance(this);
             _navigationManager.BindSyncCloudView(this);
         }
 
-        private void BtnLoginOnClick(object sender, EventArgs e)
-        {
-            try
-            {
-                _cloudLibrary.LinkApp(this);
-                _lblConnected.Text = string.Format("Is Linked: {0} {1}", _cloudLibrary.HasLinkedAccount, DateTime.Now.ToLongTimeString());
-            }
-            catch (Exception ex)
-            {
-                AlertDialog ad = new AlertDialog.Builder(this).Create();
-                ad.SetCancelable(false);
-                ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
-                ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
-                ad.Show();
-            }
-        }
-
-        private void BtnLogoutOnClick(object sender, EventArgs e)
-        {
-            try
-            {
-                _cloudLibrary.UnlinkApp();
-                _lblConnected.Text = string.Format("Is Linked: {0} {1}", _cloudLibrary.HasLinkedAccount, DateTime.Now.ToLongTimeString());
-            }
-            catch (Exception ex)
-            {
-                AlertDialog ad = new AlertDialog.Builder(this).Create();
-                ad.SetCancelable(false);
-                ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
-                ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
-                ad.Show();
-            }
-        }
-
-        private void BtnPullOnClick(object sender, EventArgs e)
-        {            
-            try
-            {
-                string nowPlaying = _cloudLibrary.PullStuff();
-                _lblValue.Text = nowPlaying;
-            }
-            catch (Exception ex)
-            {
-                AlertDialog ad = new AlertDialog.Builder(this).Create();
-                ad.SetCancelable(false);
-                ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
-                ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
-                ad.Show();
-            }
-        }
-
-        private void BtnPushOnClick(object sender, EventArgs e)
-        {
-            try
-            {
-                _cloudLibrary.PushStuff();
-                _cloudLibrary.PushPlaylist(null);
-            }
-            catch (Exception ex)
-            {
-                AlertDialog ad = new AlertDialog.Builder(this).Create();
-                ad.SetCancelable(false);
-                ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
-                ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
-                ad.Show();
-            }
-        }
-
-        private void BtnDeleteOnClick(object sender, EventArgs e)
-        {
-            try
-            {
-                _cloudLibrary.DeleteStuff();
-                _cloudLibrary.DeleteNowPlaying();
-            }
-            catch (Exception ex)
-            {
-                AlertDialog ad = new AlertDialog.Builder(this).Create();
-                ad.SetCancelable(false);
-                ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
-                ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
-                ad.Show();
-            }
-        }
-
-        private void OnCloudLibraryDataChanged(string data)
-        {
-            RunOnUiThread(() =>
-            {
-                _lblValue.Text = data;
-            });
-        }
-
         protected override void OnStart()
         {
             Console.WriteLine("SyncCloudActivity - OnStart");
diff --git a/MPfm/MPfm.Android/Classes/Application.cs b/MPfm/MPfm.Android/Classes/Application.cs
index 6f3aa6fb..ae03dcf9 100644
--- a/MPfm/MPfm.Android/Classes/Application.cs
+++ b/MPfm/MPfm.Android/Classes/Application.cs
@@ -153,7 +153,7 @@ private void BootstrapApp()
             // Complete IoC configuration
             TinyIoC.TinyIoCContainer container = Bootstrapper.GetContainer();
             container.Register<ISyncDeviceSpecifications, AndroidSyncDeviceSpecifications>().AsSingleton();
-            container.Register<ICloudLibraryService, AndroidDropboxService>().AsSingleton();
+            container.Register<ICloudService, AndroidDropboxService>().AsSingleton();
             container.Register<IAppConfigProvider, AndroidAppConfigProvider>().AsSingleton();
             container.Register<MobileNavigationManager, AndroidNavigationManager>().AsSingleton();
             container.Register<IMobileOptionsMenuView, MainActivity>().AsMultiInstance();
diff --git a/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs b/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs
index 2a3a0416..8e7cf6a9 100644
--- a/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs
+++ b/MPfm/MPfm.Android/Classes/Services/AndroidDropboxService.cs
@@ -17,28 +17,22 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Com.Dropbox.Sync.Android;
+using Java.IO;
 using MPfm.Core;
-using MPfm.Library;
-using MPfm.Library.Objects;
 using MPfm.Library.Services.Interfaces;
-using MPfm.Sound.AudioFiles;
-using MPfm.Sound.Playlists;
-using Newtonsoft.Json;
+using Console = System.Console;
 
 namespace MPfm.Android.Classes.Services
 {
-    public class AndroidDropboxService : Java.Lang.Object, ICloudLibraryService, DbxDatastore.ISyncStatusListener, DbxAccountManager.IAccountListener, DbxFileSystem.IPathListener, DbxFileSystem.ISyncStatusListener, DbxFile.IListener
+    public class AndroidDropboxService : Java.Lang.Object, ICloudService, DbxDatastore.ISyncStatusListener, DbxAccountManager.IAccountListener, DbxFileSystem.IPathListener, DbxFileSystem.ISyncStatusListener, DbxFile.IListener
     {
-        private readonly ILibraryService _libraryService;
-        private readonly IAudioFileCacheService _audioFileCacheService;
-        private readonly ISyncDeviceSpecifications _deviceSpecifications;
         private DbxAccountManager _accountManager;
         private DbxAccount _account;
-        private DbxDatastore _store;
+        //private DbxDatastore _store;
         private DbxFileSystem _fileSystem;
 
         public event CloudAuthenticationStatusChanged OnCloudAuthenticationStatusChanged;
@@ -53,11 +47,8 @@ public bool HasLinkedAccount
             }
         }
 
-        public AndroidDropboxService(ILibraryService libraryService, IAudioFileCacheService audioFileCacheService, ISyncDeviceSpecifications deviceSpecifications)
+        public AndroidDropboxService()
         {
-            _libraryService = libraryService;
-            _audioFileCacheService = audioFileCacheService;
-            _deviceSpecifications = deviceSpecifications;
             Initialize();
         }
 
@@ -81,13 +72,13 @@ private void Initialize()
 
                 if (_account != null)
                 {
-                    _store = DbxDatastore.OpenDefault(_account);
-                    _store.AddSyncStatusListener(this);
+                    //_store = DbxDatastore.OpenDefault(_account);
+                    //_store.AddSyncStatusListener(this);
 
                     _fileSystem = DbxFileSystem.ForAccount(_account);
                     _fileSystem.AddPathListener(this, new DbxPath("/"), DbxFileSystem.PathListenerMode.PathOrDescendant);
                     _fileSystem.AddSyncStatusListener(this);
-                    InitializeAppFolder();
+                    //InitializeAppFolder();
                 }
             }
             catch (Exception ex)
@@ -104,11 +95,11 @@ public void Dispose()
                 _accountManager.RemoveListener(this);
             }
 
-            if (_store != null)
-            {
-                _store.RemoveSyncStatusListener(this);
-                _store.Close();
-            }
+            //if (_store != null)
+            //{
+            //    _store.RemoveSyncStatusListener(this);
+            //    _store.Close();
+            //}
 
             if (_fileSystem != null)
             {
@@ -119,33 +110,26 @@ public void Dispose()
 
         public void LinkApp(object view)
         {
-            try
+            if (_accountManager.HasLinkedAccount)
             {
-                if (_accountManager.HasLinkedAccount)
+                _account = _accountManager.LinkedAccount;
+            }
+            else
+            {
+                if (OnCloudAuthenticationStatusChanged != null)
+                    OnCloudAuthenticationStatusChanged(CloudAuthenticationStatusType.ConnectToDropbox);
+
+                if (view is Fragment)
                 {
-                    _account = _accountManager.LinkedAccount;
+                    var fragment = (Fragment) view;
+                    _accountManager.StartLink(fragment, 0);
                 }
-                else
+                else if (view is Activity)
                 {
-                    if (OnCloudAuthenticationStatusChanged != null)
-                        OnCloudAuthenticationStatusChanged(CloudAuthenticationStatusType.ConnectToDropbox);
-
-                    if (view is Fragment)
-                    {
-                        var fragment = (Fragment) view;
-                        _accountManager.StartLink(fragment, 0);
-                    }
-                    else if (view is Activity)
-                    {
-                        var activity = (Activity)view;
-                        _accountManager.StartLink(activity, 0);                        
-                    }
+                    var activity = (Activity)view;
+                    _accountManager.StartLink(activity, 0);                        
                 }
             }
-            catch (Exception ex)
-            {
-                throw;
-            }
         }
 
         public void ContinueLinkApp()
@@ -169,389 +153,448 @@ public void UnlinkApp()
             }
         }
 
-        public void InitializeAppFolder()
+        public void CreateFolder(string path)
         {
-            try
-            {
-                // Create base folders if they don't exist
-                var pathPlaylists = new DbxPath("/Playlists");
-                var pathDevices = new DbxPath("/Devices");
-                if(!_fileSystem.Exists(pathPlaylists))
-                    _fileSystem.CreateFolder(pathPlaylists);
-                if (!_fileSystem.Exists(pathDevices))
-                    _fileSystem.CreateFolder(pathDevices);
-            }
-            catch (Exception ex)
-            {
-                Tracing.Log("AndroidDropboxService - InitializeAppFolder - Exception: {0}", ex);
-                throw;
-            }
+            if(!_fileSystem.Exists(new DbxPath(path)))
+                _fileSystem.CreateFolder(new DbxPath(path));
         }
 
-        public string PushDeviceInfo(AudioFile audioFile, long positionBytes, string position)
+        public List<string> ListFiles(string path)
         {
-            return PushNowPlaying_File(audioFile, positionBytes, position);
+            var fileInfos = _fileSystem.ListFolder(new DbxPath(path));
+            var files = fileInfos.Select(fileInfo => fileInfo.Path.Name).ToList();
+            return files;
         }
 
-        public IEnumerable<CloudDeviceInfo> PullDeviceInfos()
+        public void WatchFile(string path)
         {
-            List<CloudDeviceInfo> devices = new List<CloudDeviceInfo>();
-            DbxFile file = null;
-
-            try
-            {
-                var fileInfos = _fileSystem.ListFolder(new DbxPath("/Devices"));
-
-                foreach (var fileInfo in fileInfos)
-                {
-                    try
-                    {
-                        file = _fileSystem.Open(fileInfo.Path);
-                        //file.Update();
-                        string json = file.ReadString();
-
-                        CloudDeviceInfo device = null;
-                        try
-                        {
-                            device = JsonConvert.DeserializeObject<CloudDeviceInfo>(json);
-                            devices.Add(device);
-                        }
-                        catch (Exception ex)
-                        {
-                            Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to deserialize JSON for path {0} - ex: {1}", fileInfo.Path.Name, ex);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to download file {0} - ex: {1}", fileInfo.Path.Name, ex);
-                    }
-                    finally
-                    {
-                        if (file != null)
-                            file.Close();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Tracing.Log("AndroidDropboxService - PullDeviceInfos - Exception: {0}", ex);
-                throw;
-            }
-
-            return devices;
-        }
-
-        public string PushNowPlaying(AudioFile audioFile, long positionBytes, string position)
-        {
-            return PushNowPlaying_File(audioFile, positionBytes, position);
-        }
-
-        private string PushNowPlaying_Datastore(AudioFile audioFile, long positionBytes, string position)
-        {
-            try
-            {
-                DbxTable tableNowPlaying = _store.GetTable("nowPlaying");
-                DbxFields queryParams = new DbxFields();
-                queryParams.Set("deviceId", _deviceSpecifications.GetDeviceUniqueId());
-                DbxTable.QueryResult results = tableNowPlaying.Query(queryParams);
-                var list = results.AsList();
-
-                // Edit existing item or insert new item
-                DbxRecord record = list.Count > 0 ? list[0] : tableNowPlaying.Insert();
-                if (record != null)
-                {
-                    record.Set("audioFileId", audioFile.Id.ToString());
-                    record.Set("artistName", audioFile.ArtistName);
-                    record.Set("albumTitle", audioFile.AlbumTitle);
-                    record.Set("title", audioFile.Title);
-                    record.Set("position", "0:00.000");
-                    record.Set("positionBytes", 0);
-                    record.Set("deviceType", _deviceSpecifications.GetDeviceType().ToString());
-                    record.Set("deviceName", _deviceSpecifications.GetDeviceName());
-                    record.Set("deviceId", _deviceSpecifications.GetDeviceUniqueId());
-                    record.Set("ip", _deviceSpecifications.GetIPAddress());
-                    record.Set("timestamp", new Java.Util.Date());
-
-                    _store.Sync();
-                    return record.Id;
-                }
-            }
-            catch (Exception ex)
-            {
-                throw;
-            }
-
-            return string.Empty;
         }
 
-        private string PushNowPlaying_File(AudioFile audioFile, long positionBytes, string position)
+        public byte[] DownloadFile(string path)
         {
             DbxFile file = null;
+            byte[] bytes = null;
 
             try
             {
-                var nowPlaying = new SerializableNowPlaying(){
-                    AudioFileId = audioFile.Id,
-                    ArtistName = audioFile.ArtistName,
-                    AlbumTitle = audioFile.AlbumTitle,
-                    SongTitle = audioFile.Title,
-                    Position = position,
-                    PositionBytes = positionBytes,
-                    DeviceType = _deviceSpecifications.GetDeviceType().ToString(),
-                    DeviceName = _deviceSpecifications.GetDeviceName(),
-                    DeviceId = _deviceSpecifications.GetDeviceUniqueId(),
-                    IPAddress = _deviceSpecifications.GetIPAddress(),
-                    Timestamp = DateTime.Now
-                };
-
-                // Do we really need to check folder existence before each call?
-                var path = new DbxPath(string.Format("/Devices/{0}.json", nowPlaying.DeviceId));
-                bool fileExists = _fileSystem.Exists(path);
-                if (fileExists)
-                    file = _fileSystem.Open(path);
-                else
-                    file = _fileSystem.Create(path);
-
-                string json = JsonConvert.SerializeObject(nowPlaying);
-                file.WriteString(json);
-            }
-            catch (Exception ex)
-            {
-                Tracing.Log("AndroidDropboxService - PushNowPlaying_File - Exception: {0}", ex);
+                file = _fileSystem.Open(new DbxPath(path));
+                bytes = new byte[(int)file.ReadStream.Length];
+                var dataIs = new DataInputStream(file.ReadStream);
+                dataIs.ReadFully(bytes);
             }
             finally
             {
                 if (file != null)
                     file.Close();
             }
-            return string.Empty;
-        }
-
-        public string PullNowPlaying()
-        {
-            string text = string.Empty;
 
-            try
-            {
-                //DbxTable tableStuff = _store.GetTable("stuff");
-                //DbxFields queryParams = new DbxFields();
-                //queryParams.Set("test", true);
-                //queryParams.Set("hello", "world");
-                //DbxTable.QueryResult results = tableStuff.Query(queryParams);
-                //var list = results.AsList();
-                //if (list.Count == 0)
-                //{
-                //    //_lblValue.Text = "No value!";
-                //    return text;
-                //}
-
-                //DbxRecord firstResult = list[0];
-                //string timestamp = firstResult.GetString("timestamp");
-                //string deviceType = firstResult.GetString("deviceType");
-                //string deviceName = firstResult.GetString("deviceName");
-                //text = string.Format("{0} {1} {2}", deviceType, deviceName, timestamp);
-            }
-            catch (Exception ex)
-            {
-                throw;
-            }
-
-            return text;
+            return bytes;
         }
 
-        public void DeleteNowPlaying()
+        public void UploadFile(string path, byte[] data)
         {
-            try
-            {
-                DbxTable table = _store.GetTable("nowPlaying");
-                DbxTable.QueryResult results = table.Query();
-                var list = results.AsList();
-                foreach (var record in list)
-                {
-                    record.DeleteRecord();
-                }
-                _store.Sync();
-            }
-            catch (Exception ex)
-            {
-                throw;
-            }
-        }
+            DbxFile file = null;
 
-        public void PushHello()
-        {
-            DbxFile testFile = null;
             try
             {
-                var path = new DbxPath("hello.txt");
-                bool fileExists = _fileSystem.Exists(path);
+                var dbxPath = new DbxPath(path);
+                bool fileExists = _fileSystem.Exists(dbxPath);
                 if (fileExists)
-                    testFile = _fileSystem.Open(path);
+                    file = _fileSystem.Open(dbxPath);
                 else
-                    testFile = _fileSystem.Create(path);
-
-                testFile.WriteString(string.Format("Hello from Captain Obvious in {0} Land! I am on the spaceship {1} (code name: {2}) in the area {3}. Things are looking quite obvious to me! This message was sent on {4}.", _deviceSpecifications.GetDeviceType(), _deviceSpecifications.GetDeviceName(), _deviceSpecifications.GetDeviceUniqueId(), _deviceSpecifications.GetIPAddress(), DateTime.Now));
-            }
-            catch (Exception ex)
-            {
-                Tracing.Log("AndroidDropboxService - PushPlaylist - Exception: {0}", ex);
-                throw;
+                    file = _fileSystem.Create(dbxPath);
+                file.WriteStream.Write(data, 0, data.Length);
             }
             finally
             {
-                if (testFile != null)
-                    testFile.Close();
-            }
-        }
-
-        public string PushPlaylist(Playlist playlist)
-        {
-            DbxFile testFile = null;
-
-            try
-            {
-                // Do we really need to check folder existence before each call?
-                var path = new DbxPath(string.Format("/Playlists/{0}.json", playlist.PlaylistId));
-                bool fileExists = _fileSystem.Exists(path);
-                if(fileExists)
-                    testFile = _fileSystem.Open(path);
-                else
-                    testFile = _fileSystem.Create(path);
-
-                string json = JsonConvert.SerializeObject(playlist);
-                testFile.WriteString(json);
-                //testFile.WriteString(string.Format("Hello from Captain Obvious in {0} Land! I am on the spaceship {1} (code name: {2}) in the area {3}. Things are looking quite obvious to me! This message was sent on {4}.", _deviceSpecifications.GetDeviceType(), _deviceSpecifications.GetDeviceName(), _deviceSpecifications.GetDeviceUniqueId(), _deviceSpecifications.GetIPAddress(), DateTime.Now));
-            }
-            catch (Exception ex)
-            {
-                Tracing.Log("AndroidDropboxService - PushPlaylist - Exception: {0}", ex);
-            }
-            finally
-            {
-                if (testFile != null)
-                    testFile.Close();
-            }
-            return string.Empty;
-        }
-
-        public Playlist PullPlaylist(Guid playlistId)
-        {
-            return null;
-        }
-
-        public IEnumerable<Playlist> PullPlaylists()
-        {
-            return new List<Playlist>();
-        }
-
-        public void DeletePlaylist(Guid playlistId)
-        {
-        }
-
-        public void DeletePlaylists()
-        {
-        }
-
-        public void PushStuff()
-        {
-            try
-            {
-                DbxTable tableStuff = _store.GetTable("stuff");
-                DbxRecord stuff = tableStuff.Insert();
-                stuff.Set("hello", "world");
-                stuff.Set("deviceType", _deviceSpecifications.GetDeviceType().ToString());
-                stuff.Set("deviceName", _deviceSpecifications.GetDeviceName());
-                stuff.Set("ip", _deviceSpecifications.GetIPAddress());
-                stuff.Set("test", true);
-                stuff.Set("timestamp", DateTime.Now.ToLongTimeString());
-                _store.Sync();
-            }
-            catch (Exception ex)
-            {
-                throw;
-            }
-        }
-
-        public string PullStuff()
-        {
-            string text = string.Empty;
-
-            try
-            {
-                DbxTable tableStuff = _store.GetTable("stuff");
-                DbxFields queryParams = new DbxFields();
-                queryParams.Set("test", true);
-                queryParams.Set("hello", "world");
-                DbxTable.QueryResult results = tableStuff.Query(queryParams);
-                var list = results.AsList();
-                if (list.Count == 0)
-                {
-                    //_lblValue.Text = "No value!";
-                    return text;
-                }
-
-                DbxRecord firstResult = list[0];
-                string timestamp = firstResult.GetString("timestamp");
-                string deviceType = firstResult.GetString("deviceType");
-                string deviceName = firstResult.GetString("deviceName");
-                text = string.Format("{0} {1} {2}", deviceType, deviceName, timestamp);
-            }
-            catch (Exception ex)
-            {
-                throw;
+                if (file != null)
+                    file.Close();
             }
-
-            return text;
         }
 
-        public void DeleteStuff()
-        {
-            try
-            {
-                DbxTable tableStuff = _store.GetTable("stuff");
-                DbxTable.QueryResult results = tableStuff.Query();
-                var list = results.AsList();
-                foreach (var record in list)
-                {
-                    record.DeleteRecord();
-                }
-                _store.Sync();
-            }
-            catch (Exception ex)
-            {
-                throw;
-            }
-        }
+        //public void InitializeAppFolder()
+        //{
+        //    try
+        //    {
+        //        // Create base folders if they don't exist
+        //        var pathPlaylists = new DbxPath("/Playlists");
+        //        var pathDevices = new DbxPath("/Devices");
+        //        if(!_fileSystem.Exists(pathPlaylists))
+        //            _fileSystem.CreateFolder(pathPlaylists);
+        //        if (!_fileSystem.Exists(pathDevices))
+        //            _fileSystem.CreateFolder(pathDevices);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        Tracing.Log("AndroidDropboxService - InitializeAppFolder - Exception: {0}", ex);
+        //        throw;
+        //    }
+        //}
+
+        //public string PushDeviceInfo(AudioFile audioFile, long positionBytes, string position)
+        //{
+        //    return PushNowPlaying_File(audioFile, positionBytes, position);
+        //}
+
+        //public IEnumerable<CloudDeviceInfo> PullDeviceInfos()
+        //{
+        //    List<CloudDeviceInfo> devices = new List<CloudDeviceInfo>();
+        //    DbxFile file = null;
+
+        //    try
+        //    {
+        //        var fileInfos = _fileSystem.ListFolder(new DbxPath("/Devices"));
+
+        //        foreach (var fileInfo in fileInfos)
+        //        {
+        //            try
+        //            {
+        //                file = _fileSystem.Open(fileInfo.Path);
+        //                //file.Update();
+        //                string json = file.ReadString();
+
+        //                CloudDeviceInfo device = null;
+        //                try
+        //                {
+        //                    device = JsonConvert.DeserializeObject<CloudDeviceInfo>(json);
+        //                    devices.Add(device);
+        //                }
+        //                catch (Exception ex)
+        //                {
+        //                    Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to deserialize JSON for path {0} - ex: {1}", fileInfo.Path.Name, ex);
+        //                }
+        //            }
+        //            catch (Exception ex)
+        //            {
+        //                Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to download file {0} - ex: {1}", fileInfo.Path.Name, ex);
+        //            }
+        //            finally
+        //            {
+        //                if (file != null)
+        //                    file.Close();
+        //            }
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        Tracing.Log("AndroidDropboxService - PullDeviceInfos - Exception: {0}", ex);
+        //        throw;
+        //    }
+
+        //    return devices;
+        //}
+
+        //public string PushNowPlaying(AudioFile audioFile, long positionBytes, string position)
+        //{
+        //    return PushNowPlaying_File(audioFile, positionBytes, position);
+        //}
+
+        //private string PushNowPlaying_Datastore(AudioFile audioFile, long positionBytes, string position)
+        //{
+        //    try
+        //    {
+        //        DbxTable tableNowPlaying = _store.GetTable("nowPlaying");
+        //        DbxFields queryParams = new DbxFields();
+        //        queryParams.Set("deviceId", _deviceSpecifications.GetDeviceUniqueId());
+        //        DbxTable.QueryResult results = tableNowPlaying.Query(queryParams);
+        //        var list = results.AsList();
+
+        //        // Edit existing item or insert new item
+        //        DbxRecord record = list.Count > 0 ? list[0] : tableNowPlaying.Insert();
+        //        if (record != null)
+        //        {
+        //            record.Set("audioFileId", audioFile.Id.ToString());
+        //            record.Set("artistName", audioFile.ArtistName);
+        //            record.Set("albumTitle", audioFile.AlbumTitle);
+        //            record.Set("title", audioFile.Title);
+        //            record.Set("position", "0:00.000");
+        //            record.Set("positionBytes", 0);
+        //            record.Set("deviceType", _deviceSpecifications.GetDeviceType().ToString());
+        //            record.Set("deviceName", _deviceSpecifications.GetDeviceName());
+        //            record.Set("deviceId", _deviceSpecifications.GetDeviceUniqueId());
+        //            record.Set("ip", _deviceSpecifications.GetIPAddress());
+        //            record.Set("timestamp", new Java.Util.Date());
+
+        //            _store.Sync();
+        //            return record.Id;
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw;
+        //    }
+
+        //    return string.Empty;
+        //}
+
+        //private string PushNowPlaying_File(AudioFile audioFile, long positionBytes, string position)
+        //{
+        //    DbxFile file = null;
+
+        //    try
+        //    {
+        //        var nowPlaying = new SerializableNowPlaying(){
+        //            AudioFileId = audioFile.Id,
+        //            ArtistName = audioFile.ArtistName,
+        //            AlbumTitle = audioFile.AlbumTitle,
+        //            SongTitle = audioFile.Title,
+        //            Position = position,
+        //            PositionBytes = positionBytes,
+        //            DeviceType = _deviceSpecifications.GetDeviceType().ToString(),
+        //            DeviceName = _deviceSpecifications.GetDeviceName(),
+        //            DeviceId = _deviceSpecifications.GetDeviceUniqueId(),
+        //            IPAddress = _deviceSpecifications.GetIPAddress(),
+        //            Timestamp = DateTime.Now
+        //        };
+
+        //        // Do we really need to check folder existence before each call?
+        //        var path = new DbxPath(string.Format("/Devices/{0}.json", nowPlaying.DeviceId));
+        //        bool fileExists = _fileSystem.Exists(path);
+        //        if (fileExists)
+        //            file = _fileSystem.Open(path);
+        //        else
+        //            file = _fileSystem.Create(path);
+
+        //        string json = JsonConvert.SerializeObject(nowPlaying);
+        //        file.WriteString(json);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        Tracing.Log("AndroidDropboxService - PushNowPlaying_File - Exception: {0}", ex);
+        //    }
+        //    finally
+        //    {
+        //        if (file != null)
+        //            file.Close();
+        //    }
+        //    return string.Empty;
+        //}
+
+        //public string PullNowPlaying()
+        //{
+        //    string text = string.Empty;
+
+        //    try
+        //    {
+        //        //DbxTable tableStuff = _store.GetTable("stuff");
+        //        //DbxFields queryParams = new DbxFields();
+        //        //queryParams.Set("test", true);
+        //        //queryParams.Set("hello", "world");
+        //        //DbxTable.QueryResult results = tableStuff.Query(queryParams);
+        //        //var list = results.AsList();
+        //        //if (list.Count == 0)
+        //        //{
+        //        //    //_lblValue.Text = "No value!";
+        //        //    return text;
+        //        //}
+
+        //        //DbxRecord firstResult = list[0];
+        //        //string timestamp = firstResult.GetString("timestamp");
+        //        //string deviceType = firstResult.GetString("deviceType");
+        //        //string deviceName = firstResult.GetString("deviceName");
+        //        //text = string.Format("{0} {1} {2}", deviceType, deviceName, timestamp);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw;
+        //    }
+
+        //    return text;
+        //}
+
+        //public void DeleteNowPlaying()
+        //{
+        //    try
+        //    {
+        //        DbxTable table = _store.GetTable("nowPlaying");
+        //        DbxTable.QueryResult results = table.Query();
+        //        var list = results.AsList();
+        //        foreach (var record in list)
+        //        {
+        //            record.DeleteRecord();
+        //        }
+        //        _store.Sync();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw;
+        //    }
+        //}
+
+        //public void PushHello()
+        //{
+        //    DbxFile testFile = null;
+        //    try
+        //    {
+        //        var path = new DbxPath("hello.txt");
+        //        bool fileExists = _fileSystem.Exists(path);
+        //        if (fileExists)
+        //            testFile = _fileSystem.Open(path);
+        //        else
+        //            testFile = _fileSystem.Create(path);
+
+        //        testFile.WriteString(string.Format("Hello from Captain Obvious in {0} Land! I am on the spaceship {1} (code name: {2}) in the area {3}. Things are looking quite obvious to me! This message was sent on {4}.", _deviceSpecifications.GetDeviceType(), _deviceSpecifications.GetDeviceName(), _deviceSpecifications.GetDeviceUniqueId(), _deviceSpecifications.GetIPAddress(), DateTime.Now));
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        Tracing.Log("AndroidDropboxService - PushPlaylist - Exception: {0}", ex);
+        //        throw;
+        //    }
+        //    finally
+        //    {
+        //        if (testFile != null)
+        //            testFile.Close();
+        //    }
+        //}
+
+        //public string PushPlaylist(Playlist playlist)
+        //{
+        //    DbxFile testFile = null;
+
+        //    try
+        //    {
+        //        // Do we really need to check folder existence before each call?
+        //        var path = new DbxPath(string.Format("/Playlists/{0}.json", playlist.PlaylistId));
+        //        bool fileExists = _fileSystem.Exists(path);
+        //        if(fileExists)
+        //            testFile = _fileSystem.Open(path);
+        //        else
+        //            testFile = _fileSystem.Create(path);
+
+        //        string json = JsonConvert.SerializeObject(playlist);
+        //        testFile.WriteString(json);
+        //        //testFile.WriteString(string.Format("Hello from Captain Obvious in {0} Land! I am on the spaceship {1} (code name: {2}) in the area {3}. Things are looking quite obvious to me! This message was sent on {4}.", _deviceSpecifications.GetDeviceType(), _deviceSpecifications.GetDeviceName(), _deviceSpecifications.GetDeviceUniqueId(), _deviceSpecifications.GetIPAddress(), DateTime.Now));
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        Tracing.Log("AndroidDropboxService - PushPlaylist - Exception: {0}", ex);
+        //    }
+        //    finally
+        //    {
+        //        if (testFile != null)
+        //            testFile.Close();
+        //    }
+        //    return string.Empty;
+        //}
+
+        //public Playlist PullPlaylist(Guid playlistId)
+        //{
+        //    return null;
+        //}
+
+        //public IEnumerable<Playlist> PullPlaylists()
+        //{
+        //    return new List<Playlist>();
+        //}
+
+        //public void DeletePlaylist(Guid playlistId)
+        //{
+        //}
+
+        //public void DeletePlaylists()
+        //{
+        //}
+
+        //public void PushStuff()
+        //{
+        //    try
+        //    {
+        //        DbxTable tableStuff = _store.GetTable("stuff");
+        //        DbxRecord stuff = tableStuff.Insert();
+        //        stuff.Set("hello", "world");
+        //        stuff.Set("deviceType", _deviceSpecifications.GetDeviceType().ToString());
+        //        stuff.Set("deviceName", _deviceSpecifications.GetDeviceName());
+        //        stuff.Set("ip", _deviceSpecifications.GetIPAddress());
+        //        stuff.Set("test", true);
+        //        stuff.Set("timestamp", DateTime.Now.ToLongTimeString());
+        //        _store.Sync();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw;
+        //    }
+        //}
+
+        //public string PullStuff()
+        //{
+        //    string text = string.Empty;
+
+        //    try
+        //    {
+        //        DbxTable tableStuff = _store.GetTable("stuff");
+        //        DbxFields queryParams = new DbxFields();
+        //        queryParams.Set("test", true);
+        //        queryParams.Set("hello", "world");
+        //        DbxTable.QueryResult results = tableStuff.Query(queryParams);
+        //        var list = results.AsList();
+        //        if (list.Count == 0)
+        //        {
+        //            //_lblValue.Text = "No value!";
+        //            return text;
+        //        }
+
+        //        DbxRecord firstResult = list[0];
+        //        string timestamp = firstResult.GetString("timestamp");
+        //        string deviceType = firstResult.GetString("deviceType");
+        //        string deviceName = firstResult.GetString("deviceName");
+        //        text = string.Format("{0} {1} {2}", deviceType, deviceName, timestamp);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw;
+        //    }
+
+        //    return text;
+        //}
+
+        //public void DeleteStuff()
+        //{
+        //    try
+        //    {
+        //        DbxTable tableStuff = _store.GetTable("stuff");
+        //        DbxTable.QueryResult results = tableStuff.Query();
+        //        var list = results.AsList();
+        //        foreach (var record in list)
+        //        {
+        //            record.DeleteRecord();
+        //        }
+        //        _store.Sync();
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        throw;
+        //    }
+        //}
 
         public void OnDatastoreStatusChange(DbxDatastore store)
         {
-            Console.WriteLine("SyncCloudActivity - OnDatastoreStatusChange - hasIncoming: {0}", store.SyncStatus.HasIncoming);
-            //if (OnDropboxDataChanged != null) OnDropboxDataChanged(string.Format("Data changed: {0} incoming: {1}", DateTime.Now.ToLongTimeString(), store.SyncStatus.HasIncoming));
-            if (store.SyncStatus.HasIncoming)
-            {
-                try
-                {
-                    var changes = store.Sync();
-                    if (!changes.ContainsKey("stuff"))
-                        return;
-
-                    var records = changes["stuff"];
-                    foreach (var record in records)
-                    {
-                        string timestamp = record.GetString("timestamp");
-                        string deviceType = record.GetString("deviceType");
-                        string deviceName = record.GetString("deviceName");
-                        string text = string.Format("{0} {1} {2}", deviceType, deviceName, timestamp);
-                        if (OnCloudDataChanged != null) OnCloudDataChanged(text);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("SyncCloudActivity - OnDatastoreStatusChange exception: {0}", ex);
-                    if (OnCloudDataChanged != null) OnCloudDataChanged(string.Format("Error: {0}", ex));
-                    //throw;
-                }
-            }
+        //    Console.WriteLine("SyncCloudActivity - OnDatastoreStatusChange - hasIncoming: {0}", store.SyncStatus.HasIncoming);
+        //    //if (OnDropboxDataChanged != null) OnDropboxDataChanged(string.Format("Data changed: {0} incoming: {1}", DateTime.Now.ToLongTimeString(), store.SyncStatus.HasIncoming));
+        //    if (store.SyncStatus.HasIncoming)
+        //    {
+        //        try
+        //        {
+        //            var changes = store.Sync();
+        //            if (!changes.ContainsKey("stuff"))
+        //                return;
+
+        //            var records = changes["stuff"];
+        //            foreach (var record in records)
+        //            {
+        //                string timestamp = record.GetString("timestamp");
+        //                string deviceType = record.GetString("deviceType");
+        //                string deviceName = record.GetString("deviceName");
+        //                string text = string.Format("{0} {1} {2}", deviceType, deviceName, timestamp);
+        //                //if (OnCloudDataChanged != null) OnCloudDataChanged(text);
+        //            }
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            Console.WriteLine("SyncCloudActivity - OnDatastoreStatusChange exception: {0}", ex);
+        //            if (OnCloudDataChanged != null) OnCloudDataChanged(string.Format("Error: {0}", ex));
+        //            //throw;
+        //        }
+        //    }
         }
 
         public void OnLinkedAccountChange(DbxAccountManager accountManager, DbxAccount account)
@@ -589,32 +632,4 @@ public void OnFileChange(DbxFile file)
         }
 
     }
-
-    public class SerializablePlaylist
-    {
-        public string Name { get; set; }
-        public string DeviceId { get; set; }
-        public DateTime Timestamp { get; set; }
-        public List<Guid> AudioFiles { get; set; }
-
-        public SerializablePlaylist()
-        {
-            AudioFiles = new List<Guid>();
-        }
-    }
-
-    public class SerializableNowPlaying
-    {
-        public Guid AudioFileId { get; set; }
-        public string ArtistName { get; set; }
-        public string AlbumTitle { get; set; }
-        public string SongTitle { get; set; }
-        public string Position { get; set; }
-        public long PositionBytes { get; set; }
-        public string DeviceType { get; set; }
-        public string DeviceName { get; set; }
-        public string DeviceId { get; set; }
-        public string IPAddress { get; set; }
-        public DateTime Timestamp { get; set; }   
-    }
 }
\ No newline at end of file
diff --git a/MPfm/MPfm.Library/MPfm.Library.Android.csproj b/MPfm/MPfm.Library/MPfm.Library.Android.csproj
index b7949024..efc28436 100644
--- a/MPfm/MPfm.Library/MPfm.Library.Android.csproj
+++ b/MPfm/MPfm.Library/MPfm.Library.Android.csproj
@@ -163,6 +163,7 @@
     <Compile Include="Objects\CloudDeviceInfo.cs" />
     <Compile Include="Objects\CloudPlaylist.cs" />
     <Compile Include="Objects\PlaylistAudioFile.cs" />
+    <Compile Include="Services\CloudLibraryService.cs" />
     <Compile Include="Services\Exceptions\CloudAppNotLinkedException.cs" />
     <Compile Include="Objects\NetworkState.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
diff --git a/MPfm/MPfm.Library/MPfm.Library.csproj b/MPfm/MPfm.Library/MPfm.Library.csproj
index 898a6ae2..44ddeb55 100644
--- a/MPfm/MPfm.Library/MPfm.Library.csproj
+++ b/MPfm/MPfm.Library/MPfm.Library.csproj
@@ -182,6 +182,7 @@
     <Compile Include="Database\SQLiteGateway.cs" />
     <Compile Include="Objects\Folder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\CloudLibraryService.cs" />
     <Compile Include="Services\DropboxCoreService.cs" />
     <Compile Include="Services\Exceptions\CloudAppNotLinkedException.cs" />
     <Compile Include="Services\Interfaces\ICloudLibraryService.cs" />
diff --git a/MPfm/MPfm.Library/Services/CloudLibraryService.cs b/MPfm/MPfm.Library/Services/CloudLibraryService.cs
new file mode 100644
index 00000000..9cea6964
--- /dev/null
+++ b/MPfm/MPfm.Library/Services/CloudLibraryService.cs
@@ -0,0 +1,142 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System.Linq;
+using System.Text;
+using MPfm.Core;
+using MPfm.Library.Objects;
+using MPfm.Library.Services.Exceptions;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using MPfm.Library.Services.Interfaces;
+using MPfm.Sound.AudioFiles;
+
+namespace MPfm.Library.Services
+{
+    public class CloudLibraryService : ICloudLibraryService
+    {
+        private readonly ICloudService _cloudService;
+        private readonly ILibraryService _libraryService;
+        private readonly IAudioFileCacheService _audioFileCacheService;
+        private readonly ISyncDeviceSpecifications _deviceSpecifications;
+        private readonly List<CloudDeviceInfo> _deviceInfos; 
+
+        public bool HasLinkedAccount { get { return _cloudService.HasLinkedAccount; } }
+        public event DeviceInfoUpdated OnDeviceInfoUpdated;
+
+        public CloudLibraryService(ICloudService cloudService, ILibraryService libraryService, IAudioFileCacheService audioFileCacheService,
+            ISyncDeviceSpecifications deviceSpecifications)
+        {
+            _cloudService = cloudService;
+            _libraryService = libraryService;
+            _audioFileCacheService = audioFileCacheService;
+            _deviceSpecifications = deviceSpecifications;
+            _deviceInfos = new List<CloudDeviceInfo>();
+
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+            _cloudService.OnCloudDataChanged += CloudServiceOnCloudDataChanged;
+
+            PullDeviceInfos();            
+        }
+
+        private void CloudServiceOnCloudDataChanged(string path, string data)
+        {
+            // Check if pull device infos has ended.
+
+            // Keep a list of requested device infos, and once this is empty, notify consumer?
+        }
+
+        public void InitializeAppFolder()
+        {
+            _cloudService.CreateFolder("/Devices");
+            _cloudService.CreateFolder("/Playlists");
+        }
+
+        public void PushDeviceInfo(AudioFile audioFile, long positionBytes, string position)
+        {
+            if (!HasLinkedAccount)
+                throw new CloudAppNotLinkedException();
+
+            var device = new CloudDeviceInfo()
+            {
+                AudioFileId = audioFile.Id,
+                ArtistName = audioFile.ArtistName,
+                AlbumTitle = audioFile.AlbumTitle,
+                SongTitle = audioFile.Title,
+                Position = position,
+                PositionBytes = positionBytes,
+                DeviceType = _deviceSpecifications.GetDeviceType().ToString(),
+                DeviceName = _deviceSpecifications.GetDeviceName(),
+                DeviceId = _deviceSpecifications.GetDeviceUniqueId(),
+                IPAddress = _deviceSpecifications.GetIPAddress(),
+                Timestamp = DateTime.Now
+            };
+
+            string json = JsonConvert.SerializeObject(device);
+            byte[] bytes = Encoding.UTF8.GetBytes(json);
+            _cloudService.UploadFile(string.Format("/Devices/{0}.json", device.DeviceId), bytes);
+        }
+
+        public void PullDeviceInfos()
+        {
+            //List<CloudDeviceInfo> devices = new List<CloudDeviceInfo>();
+
+            //if (!HasLinkedAccount)
+            //    throw new CloudAppNotLinkedException();
+
+            //var filePaths = _cloudService.ListFiles("/Devices");
+            //foreach (var filePath in filePaths)
+            //{
+            //    try
+            //    {
+            //        _cloudService.WatchFile(filePath);
+
+            //        var bytes = _cloudService.DownloadFile(filePath);
+            //        string json = Encoding.UTF8.GetString(bytes);
+
+            //        CloudDeviceInfo device = null;
+            //        try
+            //        {
+            //            device = JsonConvert.DeserializeObject<CloudDeviceInfo>(json);
+            //            devices.Add(device);
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to deserialize JSON for path {0} - ex: {1}", filePath, ex);
+            //        }
+            //    }
+            //    catch (Exception ex)
+            //    {
+            //        Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to download file - ex: {0}", ex);
+            //    }
+            //}
+
+            //return devices;
+        }
+
+        public IEnumerable<CloudDeviceInfo> GetDeviceInfos()
+        {
+            return _deviceInfos.ToList();
+        }
+    }
+}
+
diff --git a/MPfm/MPfm.Library/Services/DropboxCoreService.cs b/MPfm/MPfm.Library/Services/DropboxCoreService.cs
index bf438c33..80e2ec9d 100644
--- a/MPfm/MPfm.Library/Services/DropboxCoreService.cs
+++ b/MPfm/MPfm.Library/Services/DropboxCoreService.cs
@@ -15,39 +15,31 @@
 // You should have received a copy of the GNU General Public License
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
+using System.Collections.Generic;
 using System.Text;
 using MPfm.Core;
 using MPfm.Core.Helpers;
 using MPfm.Library.Objects;
-using MPfm.Library.Services.Exceptions;
-using MPfm.Sound.Playlists;
 using Newtonsoft.Json;
 #if !IOS && !ANDROID && !WINDOWS_PHONE
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using MPfm.Library.Services.Interfaces;
-using MPfm.Sound.AudioFiles;
 using Spring.IO;
+using MPfm.Library.Services.Interfaces;
 using Spring.Social.Dropbox.Api;
 using Spring.Social.Dropbox.Connect;
 using Spring.Social.OAuth1;
 
 namespace MPfm.Library.Services
 {
-    public class DropboxCoreService : ICloudLibraryService
+    public class DropboxCoreService : ICloudService
     {
         //private const string DropboxAppKey = "6tc6565743i743n";
         //private const string DropboxAppSecret = "fbkt3neevjjl0l2";
         public const string DropboxAppKey = "m1bcpax276elhfi";
         public const string DropboxAppSecret = "2azbuj2eelkranm";
 
-        private readonly ILibraryService _libraryService;
-        private readonly IAudioFileCacheService _audioFileCacheService;
-        private readonly ISyncDeviceSpecifications _deviceSpecifications;
         private IDropbox _dropbox;
         private DropboxServiceProvider _dropboxServiceProvider;
         private OAuthToken _oauthToken;
@@ -58,12 +50,8 @@ public class DropboxCoreService : ICloudLibraryService
         public event CloudDataChanged OnCloudDataChanged;
         public event CloudAuthenticationStatusChanged OnCloudAuthenticationStatusChanged;
 
-        public DropboxCoreService(ILibraryService libraryService, IAudioFileCacheService audioFileCacheService,
-            ISyncDeviceSpecifications deviceSpecifications)
+        public DropboxCoreService()
         {
-            _libraryService = libraryService;
-            _audioFileCacheService = audioFileCacheService;
-            _deviceSpecifications = deviceSpecifications;
             Initialize();
         }
 
@@ -298,259 +286,51 @@ public void UnlinkApp()
             _dropbox = null;
         }
 
-        public void InitializeAppFolder()
-        {
-            try
-            {
-                var taskMetadata = _dropbox.GetMetadataAsync("/Playlists");
-                var taskPlaylists = _dropbox.CreateFolderAsync("/Playlists");
-                var taskDevices = _dropbox.CreateFolderAsync("/Devices");
-
-                var metadata = taskMetadata.Result;
-                var folderPlaylists = taskPlaylists.Result;
-                var folderDevices = taskDevices.Result;
-            }
-            catch (AggregateException ae)
-            {
-                ae.Handle(ex =>
-                {
-                    if (ex is DropboxApiException)
-                    {
-                        Console.WriteLine(ex.Message);
-                        return true;
-                    }
-                    return false;
-                });
-            }
-        }
-
-        public void PushHello()
+        public void CreateFolder(string path)
         {
-            // Use step by step debugging, or not             
+            var entry = _dropbox.CreateFolderAsync(path).Result;
 
-            //DeltaPage deltaPage = dropbox.DeltaAsync(null).Result;
-            //dropbox.AccessLevel
-            //Entry createFolderEntry = dropbox.CreateFolderAsync("Spring Social").Result;
-
-            //Task.Factory.StartNew(() =>
+            //try
             //{
-            //    string cursor = null;
-            //    while (true)
-            //    {
-            //        DeltaPage deltaPage = dropbox.DeltaAsync(cursor).Result;
-            //        cursor = deltaPage.Cursor;
-            //        Console.WriteLine("Delta check - entries: {0} cursor: {1} hasMore: {2} reset: {3}",
-            //            deltaPage.Entries.Count, deltaPage.Cursor, deltaPage.HasMore, deltaPage.Reset);
-            //        if (deltaPage.Entries.Count > 0)
-            //        {
-            //            //FileRef fileRef = dropbox.CreateFileRefAsync("File.txt").Result;
-            //            dropbox.DownloadFileAsync("File.txt")
-            //                .ContinueWith(task =>
-            //                {
-            //                    Console.WriteLine("File '{0}' downloaded ({1})", task.Result.Metadata.Path,
-            //                        task.Result.Metadata.Size);
-            //                    // Save file to "C:\Spring Social.txt"
-            //                    //using (FileStream fileStream = new FileStream(@"C:\Spring Social.txt", FileMode.Create))
-            //                    //{
-            //                    //    fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
-            //                    //}
-            //                });
-            //        }
-            //        Thread.Sleep(1000);
-            //    }
-            //});
-
-            //for (int a = 0; a < 10; a++)
-            //{
-            //    Thread.Sleep(4000);
-            //    string text = string.Format("Windows - Step {0}", a);
-            //    byte[] bytes = System.Text.Encoding.UTF8.GetBytes(text);
-            //    Console.WriteLine(text);
-
-            //    //var test = new ByteArrayResource(bytes);
-            //    Entry uploadFileEntry = dropbox.UploadFileAsync(
-            //        //new AssemblyResource("assembly://Spring.ConsoleQuickStart/Spring.ConsoleQuickStart/File.txt"),
-            //        new ByteArrayResource(bytes),
-            //        "File.txt", true, null, CancellationToken.None).Result;
+            //    var entry = _dropbox.CreateFolderAsync(path).Result;
             //}
-
-            //FileRef fileRef = dropbox.CreateFileRefAsync("File.txt").Result;
-            ////FileRef fileRef = dropbox.CreateFileRefAsync("Spring Social/File.txt").Result;
-            //Entry copyRefEntry = dropbox.CopyFileRefAsync(fileRef.Value, "Spring Social/File_copy_ref.txt").Result;
-            //Entry copyEntry = dropbox.CopyAsync("Spring Social/File.txt", "Spring Social/File_copy.txt").Result;
-            //Entry deleteEntry = dropbox.DeleteAsync("Spring Social/File.txt").Result;
-            //Entry moveEntry = dropbox.MoveAsync("Spring Social/File_copy.txt", "Spring Social/File.txt").Result;
-            //dropbox.DownloadFileAsync("Spring Social/File.txt")
-            //    .ContinueWith(task =>
-            //    {
-            //        Console.WriteLine("File '{0}' downloaded ({1})", task.Result.Metadata.Path, task.Result.Metadata.Size);
-            //        // Save file to "C:\Spring Social.txt"
-            //        using (FileStream fileStream = new FileStream(@"C:\Spring Social.txt", FileMode.Create))
-            //        {
-            //            fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
-            //        }
-            //    });
-            //Entry folderMetadata = dropbox.GetMetadataAsync("Spring Social").Result;
-            //IList<Entry> revisionsEntries = dropbox.GetRevisionsAsync("Spring Social/File.txt").Result;
-            //Entry restoreEntry = dropbox.RestoreAsync("Spring Social/File.txt", revisionsEntries[2].Revision).Result;
-            //IList<Entry> searchResults = dropbox.SearchAsync("Spring Social/", ".txt").Result;
-            //DropboxLink shareableLink = dropbox.GetShareableLinkAsync("Spring Social/File.txt").Result;
-            //DropboxLink mediaLink = dropbox.GetMediaLinkAsync("Spring Social/File.txt").Result;
-            //Entry uploadImageEntry = dropbox.UploadFileAsync(
-            //    new AssemblyResource("assembly://Spring.ConsoleQuickStart/Spring.ConsoleQuickStart/Image.png"),
-            //    "/Spring Social/Image.png", true, null, CancellationToken.None).Result;
-            //dropbox.DownloadThumbnailAsync("Spring Social/Image.png", ThumbnailFormat.Png, ThumbnailSize.Medium)
-            //    .ContinueWith(task =>
+            //catch (AggregateException ae)
+            //{
+            //    ae.Handle(ex =>
             //    {
-            //        Console.WriteLine("Thumbnail '{0}' downloaded ({1})", task.Result.Metadata.Path, task.Result.Metadata.Size);
-            //        // Save file to "C:\Thumbnail_Medium.png"
-            //        using (FileStream fileStream = new FileStream(@"C:\Thumbnail_Medium.png", FileMode.Create))
+            //        if (ex is DropboxApiException)
             //        {
-            //            fileStream.Write(task.Result.Content, 0, task.Result.Content.Length);
+            //            Console.WriteLine(ex.Message);
+            //            return true;
             //        }
+            //        return false;
             //    });
+            //}
         }
 
-        public void PushStuff()
-        {
-        }
-
-        public string PullStuff()
-        {
-            return string.Empty;
-        }
-
-        public void DeleteStuff()
-        {
-        }
-
-        public string PushDeviceInfo(AudioFile audioFile, long positionBytes, string position)
-        {
-            try
-            {
-                if(!HasLinkedAccount)
-                    throw new CloudAppNotLinkedException();
-
-                var device = new CloudDeviceInfo()
-                {
-                    AudioFileId = audioFile.Id,
-                    ArtistName = audioFile.ArtistName,
-                    AlbumTitle = audioFile.AlbumTitle,
-                    SongTitle = audioFile.Title,
-                    Position = position,
-                    PositionBytes = positionBytes,
-                    DeviceType = _deviceSpecifications.GetDeviceType().ToString(),
-                    DeviceName = _deviceSpecifications.GetDeviceName(),
-                    DeviceId = _deviceSpecifications.GetDeviceUniqueId(),
-                    IPAddress = _deviceSpecifications.GetIPAddress(),
-                    Timestamp = DateTime.Now
-                };
-
-                string json = JsonConvert.SerializeObject(device);
-                byte[] bytes = Encoding.UTF8.GetBytes(json);
-                var taskMetadata = _dropbox.UploadFileAsync(new ByteArrayResource(bytes), string.Format("/Devices/{0}.json", device.DeviceId));
-                var entry = taskMetadata.Result;
-            }
-            catch (AggregateException ae)
-            {
-                ae.Handle(ex =>
-                {
-                    if (ex is DropboxApiException)
-                    {
-                        Console.WriteLine(ex.Message);
-                        return true;
-                    }
-                    return false;
-                });
-            }
-            return string.Empty;
-        }
-
-        public IEnumerable<CloudDeviceInfo> PullDeviceInfos()
-        {
-            List<CloudDeviceInfo> devices = new List<CloudDeviceInfo>();
-
-            try
-            {
-                if (!HasLinkedAccount)
-                    throw new CloudAppNotLinkedException();
-
-                var entries = _dropbox.SearchAsync("/Devices", ".json").Result;                
-                foreach (var entry in entries)
-                {
-                    try
-                    {
-                        var file = _dropbox.DownloadFileAsync(entry.Path).Result;
-                        var bytes = file.Content;
-                        string json = Encoding.UTF8.GetString(bytes);
-
-                        CloudDeviceInfo device = null;
-                        try
-                        {
-                            device = JsonConvert.DeserializeObject<CloudDeviceInfo>(json);
-                            devices.Add(device);
-                        }
-                        catch (Exception ex)
-                        {
-                            Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to deserialize JSON for path {0} - ex: {1}", file.Metadata.Path, ex);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Tracing.Log("AndroidDropboxService - PullDeviceInfos - Failed to download file - ex: {0}", ex);
-                    }   
-                }
-            }
-            catch (AggregateException ae)
-            {
-                ae.Handle(ex =>
-                {
-                    if (ex is DropboxApiException)
-                    {
-                        Console.WriteLine(ex.Message);
-                        return true;
-                    }
-                    return false;
-                });
-            }
-            return devices;
-        }
-
-        public string PushNowPlaying(AudioFile audioFile, long positionBytes, string position)
-        {
-            return string.Empty;
-        }
-
-        public string PullNowPlaying()
-        {
-            return string.Empty;
-        }
-
-        public void DeleteNowPlaying()
-        {
-        }
-
-        public string PushPlaylist(Playlist playlist)
+        public List<string> ListFiles(string path)
         {
-            return string.Empty;
-        }
+            var strings = new List<string>();
+            var entries = _dropbox.SearchAsync(path, string.Empty).Result;
+            foreach (var entry in entries)
+                strings.Add(entry.Path);
 
-        public Playlist PullPlaylist(Guid playlistId)
-        {
-            return new Playlist();
+            return strings;
         }
 
-        public IEnumerable<Playlist> PullPlaylists()
+        public void WatchFile(string path)
         {
-            return new List<Playlist>();
         }
 
-        public void DeletePlaylist(Guid playlistId)
+        public byte[] DownloadFile(string path)
         {
+            var file = _dropbox.DownloadFileAsync(path).Result;
+            return file.Content;
         }
 
-        public void DeletePlaylists()
+        public void UploadFile(string path, byte[] data)
         {
+            _dropbox.UploadFileAsync(new ByteArrayResource(data), path);
         }
     }
 }
diff --git a/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs b/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs
index 18e9128c..27c767ff 100644
--- a/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs
+++ b/MPfm/MPfm.Library/Services/Interfaces/ICloudLibraryService.cs
@@ -24,37 +24,23 @@
 
 namespace MPfm.Library.Services.Interfaces
 {
+    public delegate void DeviceInfoUpdated(IEnumerable<CloudDeviceInfo> deviceInfos);
+
     /// <summary>
     /// Interface for the cloud service implementations.
     /// </summary>
     public interface ICloudLibraryService
     {
-        event CloudAuthenticationStatusChanged OnCloudAuthenticationStatusChanged;
-        event CloudAuthenticationFailed OnCloudAuthenticationFailed;
-        event CloudDataChanged OnCloudDataChanged;
+        // Do we expose the device infos directly instead of using Pull? A property or GetDeviceInfos would get a cached list.
+        // Exposing the list directly would lead the consumer to add/remove stuff. We want GetDeviceInfos instad.
 
         bool HasLinkedAccount { get; }
 
-        void LinkApp(object view);
-        void ContinueLinkApp();
-        void UnlinkApp();
+        event DeviceInfoUpdated OnDeviceInfoUpdated;
 
         void InitializeAppFolder();
-
-        void PushHello();
-
-        void PushStuff();
-        string PullStuff();
-        void DeleteStuff();
-
-        string PushDeviceInfo(AudioFile audioFile, long positionBytes, string position);
-        IEnumerable<CloudDeviceInfo> PullDeviceInfos();
-        void DeleteNowPlaying();
-
-        string PushPlaylist(Playlist playlist);
-        Playlist PullPlaylist(Guid playlistId);
-        IEnumerable<Playlist> PullPlaylists();
-        void DeletePlaylist(Guid playlistId);
-        void DeletePlaylists();
+        void PushDeviceInfo(AudioFile audioFile, long positionBytes, string position);
+        //void PullDeviceInfos(); //Do we need pull? 
+        IEnumerable<CloudDeviceInfo> GetDeviceInfos();
     }
 }
diff --git a/MPfm/MPfm.Library/Services/Interfaces/ICloudService.cs b/MPfm/MPfm.Library/Services/Interfaces/ICloudService.cs
index e203663e..018389c7 100644
--- a/MPfm/MPfm.Library/Services/Interfaces/ICloudService.cs
+++ b/MPfm/MPfm.Library/Services/Interfaces/ICloudService.cs
@@ -26,7 +26,7 @@ namespace MPfm.Library.Services.Interfaces
 {
     public delegate void CloudAuthenticationStatusChanged(CloudAuthenticationStatusType statusType);
     public delegate void CloudAuthenticationFailed();
-    public delegate void CloudDataChanged(string data);
+    public delegate void CloudDataChanged(string path, string data);
 
     /// <summary>
     /// Interface for the cloud service implementations.
@@ -43,7 +43,11 @@ public interface ICloudService
         void ContinueLinkApp();
         void UnlinkApp();
 
-        void InitializeAppFolder();
+        void CreateFolder(string path);
+        List<string> ListFiles(string path); 
+        void WatchFile(string path);
+        byte[] DownloadFile(string path);
+        void UploadFile(string path, byte[] data);
     }
 
     public enum CloudAuthenticationStatusType
diff --git a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
index 78c18628..5dfa7fef 100644
--- a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
+++ b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs
@@ -56,6 +56,7 @@ static Bootstrapper()
             container.Register<ISyncClientService, SyncClientService>().AsMultiInstance();
             container.Register<ISyncListenerService, SyncListenerService>().AsSingleton();
             container.Register<ISyncDiscoveryService, SyncDiscoveryService>().AsSingleton();
+            container.Register<ICloudLibraryService, CloudLibraryService>().AsSingleton();
 
             // Register presenters
             container.Register<ISplashPresenter, SplashPresenter>().AsSingleton();
diff --git a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
index 8d858cdf..7137f2a0 100644
--- a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
+++ b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
@@ -164,7 +164,8 @@ private void ContinueAfterSplash()
                 List<CloudDeviceInfo> infos = new List<CloudDeviceInfo>();
                 try
                 {
-                    infos = cloudLibraryService.PullDeviceInfos().OrderByDescending(x => x.Timestamp).ToList();
+                    // TODO: Move most of this stuff to SplashPresenter
+                    //infos = cloudLibraryService.PullDeviceInfos().OrderByDescending(x => x.Timestamp).ToList();
                 }
                 catch (Exception ex)
                 {
diff --git a/MPfm/MPfm.MVP/Presenters/CloudConnectPresenter.cs b/MPfm/MPfm.MVP/Presenters/CloudConnectPresenter.cs
index bebe15e8..1b3c8ae9 100644
--- a/MPfm/MPfm.MVP/Presenters/CloudConnectPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/CloudConnectPresenter.cs
@@ -33,14 +33,14 @@ namespace MPfm.MVP.Presenters
     public class CloudConnectPresenter : BasePresenter<ICloudConnectView>, ICloudConnectPresenter
 	{
 	    private readonly ITinyMessengerHub _messengerHub;
-	    private readonly ICloudLibraryService _cloudLibraryService;
+	    private readonly ICloudService _cloudService;
 
-        public CloudConnectPresenter(ITinyMessengerHub messengerHub, ICloudLibraryService cloudLibraryService)
+        public CloudConnectPresenter(ITinyMessengerHub messengerHub, ICloudService cloudService)
         {
             _messengerHub = messengerHub;
-            _cloudLibraryService = cloudLibraryService;
-            _cloudLibraryService.OnCloudAuthenticationStatusChanged += CloudLibraryServiceOnCloudAuthenticationStatusChanged;
-            _cloudLibraryService.OnCloudAuthenticationFailed += CloudLibraryServiceOnCloudAuthenticationFailed;
+            _cloudService = cloudService;
+            _cloudService.OnCloudAuthenticationStatusChanged += CloudLibraryServiceOnCloudAuthenticationStatusChanged;
+            _cloudService.OnCloudAuthenticationFailed += CloudLibraryServiceOnCloudAuthenticationFailed;
         }
 
 	    public override void BindView(ICloudConnectView view)
@@ -53,8 +53,8 @@ public override void BindView(ICloudConnectView view)
 
 	    public override void ViewDestroyed()
 	    {
-	        _cloudLibraryService.OnCloudAuthenticationStatusChanged -= CloudLibraryServiceOnCloudAuthenticationStatusChanged;
-            _cloudLibraryService.OnCloudAuthenticationFailed -= CloudLibraryServiceOnCloudAuthenticationFailed;
+            _cloudService.OnCloudAuthenticationStatusChanged -= CloudLibraryServiceOnCloudAuthenticationStatusChanged;
+            _cloudService.OnCloudAuthenticationFailed -= CloudLibraryServiceOnCloudAuthenticationFailed;
 	    }
 
 	    private void Initialize()
@@ -70,7 +70,7 @@ private void Initialize()
 	        {
 	            try
 	            {
-                    _cloudLibraryService.LinkApp(View);
+                    _cloudService.LinkApp(View);
 	            }
 	            catch (Exception ex)
 	            {
@@ -112,7 +112,7 @@ private void CheckIfAccountIsLinked()
             {
                 try
                 {
-                    _cloudLibraryService.ContinueLinkApp();
+                    _cloudService.ContinueLinkApp();
                 }
                 catch (Exception ex)
                 {
diff --git a/MPfm/MPfm.MVP/Presenters/CloudPreferencesPresenter.cs b/MPfm/MPfm.MVP/Presenters/CloudPreferencesPresenter.cs
index 7c0707eb..1bc830b5 100644
--- a/MPfm/MPfm.MVP/Presenters/CloudPreferencesPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/CloudPreferencesPresenter.cs
@@ -41,12 +41,12 @@ public class CloudPreferencesPresenter : BasePresenter<ICloudPreferencesView>, I
         private readonly MobileNavigationManager _mobileNavigationManager;
         private readonly NavigationManager _navigationManager;
 	    private readonly ITinyMessengerHub _messengerHub;
-	    private readonly ICloudLibraryService _cloudLibraryService;
+	    private readonly ICloudService _cloudService;
 
-	    public CloudPreferencesPresenter(ITinyMessengerHub messengerHub, ICloudLibraryService cloudLibraryService)
+	    public CloudPreferencesPresenter(ITinyMessengerHub messengerHub, ICloudService cloudService)
         {
 	        _messengerHub = messengerHub;
-	        _cloudLibraryService = cloudLibraryService;
+            _cloudService = cloudService;
 
 	        _messengerHub.Subscribe<CloudConnectStatusChangedMessage>(CloudConnectStatusChanged);
 
@@ -85,11 +85,11 @@ private void SetCloudPreferences(CloudAppConfig config)
     
         private void LoginLogoutDropbox()
         {
-            if (_cloudLibraryService.HasLinkedAccount)
+            if (_cloudService.HasLinkedAccount)
             {
                 Task.Factory.StartNew(() =>
                 {
-                    _cloudLibraryService.UnlinkApp();
+                    _cloudService.UnlinkApp();
                     RefreshState();
                 });
             }
@@ -110,7 +110,7 @@ private void RefreshState()
 	    {
 	        var state = new CloudPreferencesStateEntity()
 	        {
-	            IsDropboxLinkedToApp = _cloudLibraryService.HasLinkedAccount
+                IsDropboxLinkedToApp = _cloudService.HasLinkedAccount
 	        };
 	        View.RefreshCloudPreferencesState(state);
 	    }
diff --git a/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs b/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs
index 747121d1..48607d19 100644
--- a/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/ResumePlaybackPresenter.cs
@@ -53,14 +53,7 @@ public ResumePlaybackPresenter(ITinyMessengerHub messengerHub, IAudioFileCacheSe
             _audioFileCacheService = audioFileCacheService;
             _cloudLibrary = cloudLibrary;
             _playerService = playerService;
-            _cloudLibrary.OnCloudDataChanged += (data) => {
-                Task.Factory.StartNew(() => {
-                    Console.WriteLine("ResumePlaybackPresenter - OnCloudDataChanged - Sleeping...");
-                    Thread.Sleep(500); // TODO: Wait for download to finish with listener (see Dropbox docs)
-                    Console.WriteLine("ResumePlaybackPresenter - OnCloudDataChanged - Fetching device infos...");
-                    RefreshDevices();
-                });
-            };
+            _cloudLibrary.OnDeviceInfoUpdated += CloudLibraryOnDeviceInfoUpdated;
 
             #if IOS || ANDROID || WINDOWS_PHONE || WINDOWSSTORE
             _mobileNavigationManager = Bootstrapper.GetContainer().Resolve<MobileNavigationManager>();
@@ -69,7 +62,19 @@ public ResumePlaybackPresenter(ITinyMessengerHub messengerHub, IAudioFileCacheSe
             #endif
 		}
 
-        public override void BindView(IResumePlaybackView view)
+	    private void CloudLibraryOnDeviceInfoUpdated(IEnumerable<CloudDeviceInfo> deviceInfos)
+	    {
+            //_cloudLibrary.OnCloudDataChanged += (data) => {
+            //    Task.Factory.StartNew(() => {
+            //        Console.WriteLine("ResumePlaybackPresenter - OnCloudDataChanged - Sleeping...");
+            //        Thread.Sleep(500); // TODO: Wait for download to finish with listener (see Dropbox docs)
+            //        Console.WriteLine("ResumePlaybackPresenter - OnCloudDataChanged - Fetching device infos...");
+            //        RefreshDevices();
+            //    });
+            //};
+        }
+
+	    public override void BindView(IResumePlaybackView view)
         {
             view.OnResumePlayback = ResumePlayback;
             view.OnOpenPreferencesView = OpenPreferencesView;
@@ -98,51 +103,51 @@ private void CheckCloudLoginStatus()
 
 	    private void RefreshDevices()
 	    {
-            // Prevent login status change during loading
-	        _canRefreshCloudLoginStatus = false;
-
-            Task.Factory.StartNew(() =>
-            {
-
-                try
-                {
-                    var devices = _cloudLibrary.PullDeviceInfos();
-                    var entities = new List<ResumePlaybackEntity>();
-                    foreach (var device in devices)
-                    {
-                        var audioFile = _audioFileCacheService.AudioFiles.FirstOrDefault(x => x.Id == device.AudioFileId);
-                        if (audioFile == null)
-                        {
-                            audioFile = _audioFileCacheService.AudioFiles.FirstOrDefault(x => x.ArtistName.ToUpper() == device.ArtistName.ToUpper() &&
-                            x.AlbumTitle.ToUpper() == device.AlbumTitle.ToUpper() &&
-                            x.Title.ToUpper() == device.SongTitle.ToUpper());
-                        }
-                        var audioFiles = _audioFileCacheService.SelectAudioFiles(new LibraryQuery() {
-                            ArtistName = device.ArtistName,
-                            AlbumTitle = device.AlbumTitle
-                        });
-
-                        bool canResume = audioFiles.Count() > 0;
-
-                        entities.Add(new ResumePlaybackEntity() {
-                            DeviceInfo = device,
-                            LocalAudioFilePath = audioFile == null ? string.Empty : audioFile.FilePath,
-                            CanResumePlayback = canResume
-                        });
-                    }
-
-                    View.RefreshDevices(entities.OrderByDescending(x => x.CanResumePlayback).ThenBy(x => x.DeviceInfo.DeviceName).ToList());
-                    View.RefreshAppLinkedStatus(true);
-                } catch (CloudAppNotLinkedException ex)
-                {
-                    View.RefreshAppLinkedStatus(false);
-                } catch (Exception ex)
-                {
-                    View.ResumePlaybackError(ex);
-                }
-
-                _canRefreshCloudLoginStatus = true;
-            });
+            //// Prevent login status change during loading
+            //_canRefreshCloudLoginStatus = false;
+
+            //Task.Factory.StartNew(() =>
+            //{
+
+            //    try
+            //    {
+            //        var devices = _cloudLibrary.PullDeviceInfos();
+            //        var entities = new List<ResumePlaybackEntity>();
+            //        foreach (var device in devices)
+            //        {
+            //            var audioFile = _audioFileCacheService.AudioFiles.FirstOrDefault(x => x.Id == device.AudioFileId);
+            //            if (audioFile == null)
+            //            {
+            //                audioFile = _audioFileCacheService.AudioFiles.FirstOrDefault(x => x.ArtistName.ToUpper() == device.ArtistName.ToUpper() &&
+            //                x.AlbumTitle.ToUpper() == device.AlbumTitle.ToUpper() &&
+            //                x.Title.ToUpper() == device.SongTitle.ToUpper());
+            //            }
+            //            var audioFiles = _audioFileCacheService.SelectAudioFiles(new LibraryQuery() {
+            //                ArtistName = device.ArtistName,
+            //                AlbumTitle = device.AlbumTitle
+            //            });
+
+            //            bool canResume = audioFiles.Count() > 0;
+
+            //            entities.Add(new ResumePlaybackEntity() {
+            //                DeviceInfo = device,
+            //                LocalAudioFilePath = audioFile == null ? string.Empty : audioFile.FilePath,
+            //                CanResumePlayback = canResume
+            //            });
+            //        }
+
+            //        View.RefreshDevices(entities.OrderByDescending(x => x.CanResumePlayback).ThenBy(x => x.DeviceInfo.DeviceName).ToList());
+            //        View.RefreshAppLinkedStatus(true);
+            //    } catch (CloudAppNotLinkedException ex)
+            //    {
+            //        View.RefreshAppLinkedStatus(false);
+            //    } catch (Exception ex)
+            //    {
+            //        View.ResumePlaybackError(ex);
+            //    }
+
+            //    _canRefreshCloudLoginStatus = true;
+            //});
         }
 
         private void ResumePlayback(ResumePlaybackEntity entity)
diff --git a/MPfm/MPfm.MVP/Presenters/SplashPresenter.cs b/MPfm/MPfm.MVP/Presenters/SplashPresenter.cs
index d11b569c..a02e198b 100644
--- a/MPfm/MPfm.MVP/Presenters/SplashPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/SplashPresenter.cs
@@ -38,71 +38,23 @@ public SplashPresenter(IInitializationService initializationService, IPlayerServ
             _playerService = playerService;
 		}
 
-#if IOS || WINDOWS_PHONE
-        // iOS: Use async because ContinueWith has a strange behavior in Xamarin.iOS 7+. TODO: Check for a solution with Xamarin
-        public async void Initialize(Action onInitDone)
+        public void Initialize(Action onInitDone)
         {
             if (_playerService.IsInitialized)
             {
-                if(onInitDone != null)
-                    onInitDone.Invoke();
+                onInitDone();
                 return;
             }
 
-            var task = Task<string>.Factory.StartNew(() =>
-                                                     {
-                Console.WriteLine("SplashPresenter - Initialize - Initializing service on another thread...");
-                View.RefreshStatus("Loading...");
-                _initializationService.Initialize();
-                Console.WriteLine("SplashPresenter - Initialize - Initializing service on another thread... DONE!");
-                return string.Empty;
-            });
-            Console.WriteLine("SplashPresenter - Initialize - Before task");
-            string test = await task;
-            Console.WriteLine("SplashPresenter - Initialize - After task");
-
             // Initialize player
-            Console.WriteLine("SplashPresenter - Initialize - Initializing player on main thread...");
-            Device device = new Device(){
+            View.RefreshStatus("Initializing player...");
+            Device device = new Device()
+            {
                 DriverType = DriverType.DirectSound,
                 Id = -1
             };
             _playerService.Initialize(device, 44100, 1000, 100);
-            View.InitDone(true);
-            if(onInitDone != null)
-                onInitDone.Invoke();
-            Console.WriteLine("SplashPresenter - Initialize - Initializing player on main thread... DONE!");
-            View.RefreshStatus("Opening app...");
-
-            //            Task.Factory.StartNew(() =>
-            //            {
-            //                Console.WriteLine("SplashPresenter - Initialize - Initializing service on another thread...");
-            //                View.RefreshStatus("Loading...");
-            //                _initializationService.Initialize();
-            //            }).ContinueWith((a) =>
-            //            {
-            //                // Initialize player
-            //                Console.WriteLine("SplashPresenter - Initialize - Initializing player on main thread...");
-            //                Device device = new Device(){
-            //                    DriverType = DriverType.DirectSound,
-            //                    Id = -1
-            //                };
-            //                _playerService.Initialize(device, 44100, 1000, 100);
-            //                View.InitDone(true);
-            //                onInitDone.Invoke();
-            //                Console.WriteLine("SplashPresenter - Initialize - Initializing player on main thread... DONE!");
-            //                View.RefreshStatus("Opening app...");
-            //            }, taskScheduler);
-
-        }
-#else
-        public void Initialize(Action onInitDone)
-        {
-            if (_playerService.IsInitialized)
-            {
-                onInitDone.Invoke();
-                return;
-            }
+            View.RefreshStatus("Init player done");
 
             TaskScheduler taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
             #if LINUX
@@ -110,23 +62,16 @@ public void Initialize(Action onInitDone)
             taskScheduler = TaskScheduler.Default;
             #endif
             Task.Factory.StartNew(() =>
-                                  {
-                View.RefreshStatus("Loading...");
+            {
+                View.RefreshStatus("Starting initialization service...");
                 _initializationService.Initialize();
+                View.RefreshStatus("Starting initialization service (2)...");
             }).ContinueWith((a) =>
-                            {
-                // Initialize player
-                Device device = new Device(){
-                    DriverType = DriverType.DirectSound,
-                    Id = -1
-                };
-                _playerService.Initialize(device, 44100, 1000, 100);
+            {
                 View.InitDone(true);
                 onInitDone.Invoke();
                 View.RefreshStatus("Opening app...");
             }, taskScheduler);
         }
-#endif
-
 	}
 }
diff --git a/MPfm/MPfm.MVP/Services/PlayerService.cs b/MPfm/MPfm.MVP/Services/PlayerService.cs
index a81b9761..a4019f2d 100644
--- a/MPfm/MPfm.MVP/Services/PlayerService.cs
+++ b/MPfm/MPfm.MVP/Services/PlayerService.cs
@@ -275,7 +275,7 @@ private void NotifyPlaylistUpdate()
             _messengerHub.PublishAsync<PlayerPlaylistUpdatedMessage>(new PlayerPlaylistUpdatedMessage(this));
 
             Task.Factory.StartNew(() => {
-                _cloudLibraryService.PushPlaylist(_player.Playlist);
+                //_cloudLibraryService.PushPlaylist(_player.Playlist);
             });
         }
 
diff --git a/MPfm/MPfm.WPF/Classes/App.xaml.cs b/MPfm/MPfm.WPF/Classes/App.xaml.cs
index a79a08f6..5fbaa885 100644
--- a/MPfm/MPfm.WPF/Classes/App.xaml.cs
+++ b/MPfm/MPfm.WPF/Classes/App.xaml.cs
@@ -71,7 +71,7 @@ private void RegisterIoC()
         {
             // Finish IoC registration
             Bootstrapper.GetContainer().Register<ISyncDeviceSpecifications, WindowsSyncDeviceSpecifications>().AsSingleton();
-            Bootstrapper.GetContainer().Register<ICloudLibraryService, DropboxCoreService>().AsSingleton();
+            Bootstrapper.GetContainer().Register<ICloudService, DropboxCoreService>().AsSingleton();            
             Bootstrapper.GetContainer().Register<IAppConfigProvider, XmlAppConfigProvider>().AsSingleton();
             Bootstrapper.GetContainer().Register<NavigationManager, WindowsNavigationManager>().AsSingleton();
             Bootstrapper.GetContainer().Register<ISplashView, SplashWindow>().AsMultiInstance();