diff --git a/Server/Server.sln b/Server/Server.sln
index 3a651b1..5f26819 100644
--- a/Server/Server.sln
+++ b/Server/Server.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2037
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{85D4C921-0B3D-4BD1-A3CE-47F99D4FBA91}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{DFBA4A49-264B-44B8-97FA-44CC2013386D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +11,15 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{85D4C921-0B3D-4BD1-A3CE-47F99D4FBA91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85D4C921-0B3D-4BD1-A3CE-47F99D4FBA91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85D4C921-0B3D-4BD1-A3CE-47F99D4FBA91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85D4C921-0B3D-4BD1-A3CE-47F99D4FBA91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFBA4A49-264B-44B8-97FA-44CC2013386D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFBA4A49-264B-44B8-97FA-44CC2013386D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFBA4A49-264B-44B8-97FA-44CC2013386D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFBA4A49-264B-44B8-97FA-44CC2013386D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B31E8919-4385-4147-BBBD-0AC69E47DA40}
+		SolutionGuid = {D2F72D19-C7A9-4C84-8E43-88DD3D461C61}
 	EndGlobalSection
 EndGlobal
diff --git a/Server/Server/Properties/AssemblyInfo.cs b/Server/Server/Properties/AssemblyInfo.cs
index d5c47ea..1c8e6e6 100644
--- a/Server/Server/Properties/AssemblyInfo.cs
+++ b/Server/Server/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("85d4c921-0b3d-4bd1-a3ce-47f99d4fba91")]
+[assembly: Guid("dfba4a49-264b-44b8-97fa-44cc2013386d")]
 
 // Version information for an assembly consists of the following four values:
 //
diff --git a/Server/Server/Server.csproj b/Server/Server/Server.csproj
index 74e9d10..7920549 100644
--- a/Server/Server/Server.csproj
+++ b/Server/Server/Server.csproj
@@ -8,7 +8,7 @@
     <ProductVersion>
     </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{85D4C921-0B3D-4BD1-A3CE-47F99D4FBA91}</ProjectGuid>
+    <ProjectGuid>{DFBA4A49-264B-44B8-97FA-44CC2013386D}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -24,6 +24,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,6 +49,8 @@
       <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -76,13 +79,26 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Global.asax" />
+    <Content Include="home.aspx" />
+    <Content Include="Service.svc" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="home.aspx.cs">
+      <DependentUpon>home.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="home.aspx.designer.cs">
+      <DependentUpon>home.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="IService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Service.svc.cs">
+      <DependentUpon>Service.svc</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
@@ -101,9 +117,9 @@
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>49974</DevelopmentServerPort>
+          <DevelopmentServerPort>49738</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:49974/</IISUrl>
+          <IISUrl>http://localhost:49738/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>