diff --git a/MooBoo.DataAcessLayer/SQLite.cs b/MooBoo.DataAcessLayer/SQLite.cs
diff --git a/MooBoo.DataAcessLayer/SQLiteAsync.cs b/MooBoo.DataAcessLayer/SQLiteAsync.cs
diff --git a/MooBoo.DataAcessLayer/packages.config b/MooBoo.DataAcessLayer/packages.config
diff --git a/MooBoo.Model/DataLayer/Category.cs b/MooBoo.Model/DataLayer/Category.cs
@@ -1,6 +1,6 @@
 namespace MooBoo.Model.DataLayer
 {
-    public class Category
+    public class Category : DataObject
     {
         public string Name { get; set; }
         public double Value { get; set; }

diff --git a/MooBoo.Model/DataLayer/DataObject.cs b/MooBoo.Model/DataLayer/DataObject.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MooBoo.Model.DataLayer
+{
+    public class DataObject
+    {
+        public int Id { get; set; }
+    }
+}
diff --git a/MooBoo.Model/DataLayer/LogItem.cs b/MooBoo.Model/DataLayer/LogItem.cs
@@ -2,9 +2,9 @@
 
 namespace MooBoo.Model.DataLayer
 {
-    public class LogItem
+    public class LogItem : DataObject
     {
-        public Category Category { get; set; }
+        public int CategoryId { get; set; }
         public string FileName { get; set; }
         public DateTime Start { get; set; }
         public DateTime Stop { get; set; }

diff --git a/MooBoo.Model/MooBoo.Model.csproj b/MooBoo.Model/MooBoo.Model.csproj
@@ -41,6 +41,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DataLayer\Category.cs" />
+    <Compile Include="DataLayer\DataObject.cs" />
     <Compile Include="DataLayer\LogItem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/MooBoo.ToggleWrapper/Properties/AssemblyInfo.cs b/MooBoo.ToggleWrapper/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/MooBoo.ToggleWrapper/Services/BaseAPI.cs b/MooBoo.ToggleWrapper/Services/BaseAPI.cs
@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using global::Toggl.Services;
 
 namespace Mooboo.ToggleWrapper.Services
 {
-    using global::Toggl.QueryObjects;
     using global::Toggl.Services;
     using Toggl;
 

diff --git a/MooBoo.ToggleWrapper/bin/Debug/ToggleSandbox.dll b/MooBoo.ToggleWrapper/bin/Debug/ToggleSandbox.dll
diff --git a/MooBoo.ToggleWrapper/bin/Debug/ToggleSandbox.pdb b/MooBoo.ToggleWrapper/bin/Debug/ToggleSandbox.pdb
diff --git a/MooBoo.ToggleWrapper/obj/Debug/MooBoo.ToggleWrapper.csproj.FileListAbsolute.txt b/MooBoo.ToggleWrapper/obj/Debug/MooBoo.ToggleWrapper.csproj.FileListAbsolute.txt
@@ -7,3 +7,12 @@ C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\MooBoo.ToggleWrapper\bin
 C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\MooBoo.ToggleWrapper\obj\Debug\MooBoo.ToggleWrapper.csprojResolveAssemblyReference.cache
 C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\MooBoo.ToggleWrapper\obj\Debug\ToggleSandbox.dll
 C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\MooBoo.ToggleWrapper\obj\Debug\ToggleSandbox.pdb
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\bin\Debug\ToggleSandbox.dll
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\bin\Debug\ToggleSandbox.pdb
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\bin\Debug\Newtonsoft.Json.dll
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\bin\Debug\Toggl.dll
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\bin\Debug\Newtonsoft.Json.pdb
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\bin\Debug\Newtonsoft.Json.xml
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\obj\Debug\MooBoo.ToggleWrapper.csprojResolveAssemblyReference.cache
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\obj\Debug\ToggleSandbox.dll
+D:\MyProjects\MooBoo\MooBoo.ToggleWrapper\obj\Debug\ToggleSandbox.pdb
diff --git a/MooBoo.ToggleWrapper/obj/Debug/MooBoo.ToggleWrapper.csprojResolveAssemblyReference.cache b/MooBoo.ToggleWrapper/obj/Debug/MooBoo.ToggleWrapper.csprojResolveAssemblyReference.cache
diff --git a/MooBoo.ToggleWrapper/obj/Debug/ToggleSandbox.dll b/MooBoo.ToggleWrapper/obj/Debug/ToggleSandbox.dll
diff --git a/MooBoo.ToggleWrapper/obj/Debug/ToggleSandbox.pdb b/MooBoo.ToggleWrapper/obj/Debug/ToggleSandbox.pdb
diff --git a/MooBoo.sln b/MooBoo.sln
@@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MooBoo.Infrastructure", "Mo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MooBoo.Model", "MooBoo.Model\MooBoo.Model.csproj", "{449C3C76-8520-4973-9384-3DCAE8E1328E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mooboo.Utilities", "Mooboo.Utilities\Mooboo.Utilities.csproj", "{A17EAA85-B11F-45F1-8F32-E7D75F01A054}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,6 +47,10 @@ Global
 		{9A2AD477-5E98-4A1A-87B5-99AB348771D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A2AD477-5E98-4A1A-87B5-99AB348771D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A2AD477-5E98-4A1A-87B5-99AB348771D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDF5DE33-BE37-46BF-B615-7FB7BF52ACD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDF5DE33-BE37-46BF-B615-7FB7BF52ACD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDF5DE33-BE37-46BF-B615-7FB7BF52ACD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDF5DE33-BE37-46BF-B615-7FB7BF52ACD9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8ACD5CCC-14BC-4BCC-B68D-DD23E420D6A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8ACD5CCC-14BC-4BCC-B68D-DD23E420D6A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8ACD5CCC-14BC-4BCC-B68D-DD23E420D6A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,6 +59,10 @@ Global
 		{449C3C76-8520-4973-9384-3DCAE8E1328E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{449C3C76-8520-4973-9384-3DCAE8E1328E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{449C3C76-8520-4973-9384-3DCAE8E1328E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A17EAA85-B11F-45F1-8F32-E7D75F01A054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A17EAA85-B11F-45F1-8F32-E7D75F01A054}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A17EAA85-B11F-45F1-8F32-E7D75F01A054}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A17EAA85-B11F-45F1-8F32-E7D75F01A054}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/MooBoo/Model/WindowChangeEntry.cs b/MooBoo/Model/WindowChangeEntry.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MooBoo.Model
 {

diff --git a/Mooboo.Demo/bin/Debug/Mooboo.Demo.exe b/Mooboo.Demo/bin/Debug/Mooboo.Demo.exe
diff --git a/Mooboo.Demo/bin/Debug/Mooboo.Demo.pdb b/Mooboo.Demo/bin/Debug/Mooboo.Demo.pdb
diff --git a/Mooboo.Demo/bin/Debug/ToggleSandbox.dll b/Mooboo.Demo/bin/Debug/ToggleSandbox.dll
diff --git a/Mooboo.Demo/bin/Debug/ToggleSandbox.pdb b/Mooboo.Demo/bin/Debug/ToggleSandbox.pdb
diff --git a/Mooboo.Demo/obj/Debug/Mooboo.Demo.csproj.FileListAbsolute.txt b/Mooboo.Demo/obj/Debug/Mooboo.Demo.csproj.FileListAbsolute.txt
@@ -10,3 +10,15 @@ C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\Mooboo.Demo\bin\Debug\Ne
 C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\Mooboo.Demo\obj\Debug\Mooboo.Demo.csprojResolveAssemblyReference.cache
 C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\Mooboo.Demo\obj\Debug\Mooboo.Demo.exe
 C:\Users\1\Documents\Visual Studio 2015\Projects\Mooboo\Mooboo.Demo\obj\Debug\Mooboo.Demo.pdb
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\Mooboo.Demo.exe.config
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\Mooboo.Demo.exe
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\Mooboo.Demo.pdb
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\ToggleSandbox.dll
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\Toggl.dll
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\Newtonsoft.Json.dll
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\ToggleSandbox.pdb
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\Newtonsoft.Json.pdb
+D:\MyProjects\MooBoo\Mooboo.Demo\bin\Debug\Newtonsoft.Json.xml
+D:\MyProjects\MooBoo\Mooboo.Demo\obj\Debug\Mooboo.Demo.csprojResolveAssemblyReference.cache
+D:\MyProjects\MooBoo\Mooboo.Demo\obj\Debug\Mooboo.Demo.exe
+D:\MyProjects\MooBoo\Mooboo.Demo\obj\Debug\Mooboo.Demo.pdb
diff --git a/Mooboo.Demo/obj/Debug/Mooboo.Demo.csprojResolveAssemblyReference.cache b/Mooboo.Demo/obj/Debug/Mooboo.Demo.csprojResolveAssemblyReference.cache
diff --git a/Mooboo.Demo/obj/Debug/Mooboo.Demo.exe b/Mooboo.Demo/obj/Debug/Mooboo.Demo.exe
diff --git a/Mooboo.Demo/obj/Debug/Mooboo.Demo.pdb b/Mooboo.Demo/obj/Debug/Mooboo.Demo.pdb
diff --git a/Mooboo.Utilities/Mooboo.Utilities.csproj b/Mooboo.Utilities/Mooboo.Utilities.csproj
@@ -42,6 +42,7 @@
   <ItemGroup>
     <Compile Include="Scheduler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Singleton.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Mooboo.Utilities/Singleton.cs b/Mooboo.Utilities/Singleton.cs
@@ -0,0 +1,23 @@
+namespace Mooboo.Utilities
+{
+    public class Singleton<T> where T : class, new()
+    {
+        protected Singleton()
+        {
+        }
+
+        private static T _instance;
+
+        public static T Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new T();
+                }
+                return _instance;
+            }
+        }
+    }
+}