diff --git a/.gitignore b/.gitignore
index bdafab7c79c44af13f30b865ebdaa50bf921331a..9e0264844c4f97275c4a62788fd3591d2ed51fa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 [dD]ebug
-*.opensdf
\ No newline at end of file
+*.opensdf
+store.dat
diff --git a/program/.gitignore b/program/.gitignore
index 9360ec442afd40102428d144fdb4a0eb0c7c3396..e4bd8d46d7dd12733adaa6dd8fe2899166463931 100644
--- a/program/.gitignore
+++ b/program/.gitignore
@@ -2,4 +2,7 @@
 *.opensdf
 *.obj
 *.pdb
-token.data
\ No newline at end of file
+token.data
+data
+temp
+cloud
diff --git a/program/Build/RaspberryCloud.sdf b/program/Build/RaspberryCloud.sdf
index 6c89e0efa411ced72a4966487945b8d0bc3872d9..4f9c5f3fccc5d753f47837fe77623c5b5edbfd87 100644
Binary files a/program/Build/RaspberryCloud.sdf and b/program/Build/RaspberryCloud.sdf differ
diff --git a/program/Build/RaspberryCloud.v12.suo b/program/Build/RaspberryCloud.v12.suo
index 604feee648da072b4324ed7d899f3ba020119bdd..0e72be7db554e35abd8b10faa06020a369326f72 100644
Binary files a/program/Build/RaspberryCloud.v12.suo and b/program/Build/RaspberryCloud.v12.suo differ
diff --git a/program/Build/RaspberryCloud/RaspberryCloud.vcxproj b/program/Build/RaspberryCloud/RaspberryCloud.vcxproj
index d94126491b021bb9820ae7c26df29acf72d827ae..26fc1aa682480dc35924317fe93786e45acf6e07 100644
--- a/program/Build/RaspberryCloud/RaspberryCloud.vcxproj
+++ b/program/Build/RaspberryCloud/RaspberryCloud.vcxproj
@@ -108,6 +108,7 @@
     <ClCompile Include="..\..\Source\fileModel\FileDescriptor.cpp" />
     <ClCompile Include="..\..\Source\fileModel\Fragment.cpp" />
     <ClCompile Include="..\..\Source\fileModel\LockFile.cpp" />
+    <ClCompile Include="..\..\Source\fileModel\ReturnableFile.cpp" />
     <ClCompile Include="..\..\Source\logger\Logger.cpp" />
     <ClCompile Include="..\..\Source\networking\ConcreteEncryption.cpp" />
     <ClCompile Include="..\..\Source\networking\FileServerConnection.cpp" />
@@ -140,6 +141,7 @@
     <ClInclude Include="..\..\Source\fileModel\FileDescriptor.h" />
     <ClInclude Include="..\..\Source\fileModel\Fragment.h" />
     <ClInclude Include="..\..\Source\fileModel\LockFile.h" />
+    <ClInclude Include="..\..\Source\fileModel\ReturnableFile.h" />
     <ClInclude Include="..\..\Source\logger\Logger.h" />
     <ClInclude Include="..\..\Source\networking\ConcreteEncryption.h" />
     <ClInclude Include="..\..\Source\networking\FileServerConnection.h" />
diff --git a/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.filters b/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.filters
index 913ba94f30537e89eae8ca2f166746348ca53f57..96ef00de5d090fd98671506cd3d9f86887d7ccea 100644
--- a/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.filters
+++ b/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.filters
@@ -138,6 +138,9 @@
     <ClCompile Include="..\..\Source\cloud\FTPAdapter.cpp">
       <Filter>Source Files\cloud\adapter</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\fileModel\ReturnableFile.cpp">
+      <Filter>Source Files\fileModel</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\app\UI.h">
@@ -236,5 +239,8 @@
     <ClInclude Include="..\..\Source\cloud\LocalCloudAdapter.h">
       <Filter>Header Files\cloud\adapter</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\fileModel\ReturnableFile.h">
+      <Filter>Header Files\fileModel</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.user b/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.user
index ff5921cf0d2fd9ab81317dc308955058e0042125..64a3621a437c792daa9e8ebbf84ed009acb26092 100644
--- a/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.user
+++ b/program/Build/RaspberryCloud/RaspberryCloud.vcxproj.user
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-dc:\Work\raspberrycloud\program\data\ -cc:\Work\raspberrycloud\program\cloud\ -fc:\Work\raspberrycloud\program\temp\</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/program/Source/dataAccess/Decoder.cpp b/program/Source/dataAccess/Decoder.cpp
index 62912bea00e82e4c4e3cd9bd6a066488534a43aa..5fde2b48ce6b91ea742c5faf39b7043a6b5d67e3 100644
--- a/program/Source/dataAccess/Decoder.cpp
+++ b/program/Source/dataAccess/Decoder.cpp
@@ -52,7 +52,7 @@ ReturnableFile Decoder::decode(FileDescriptor* fileDescriptor)
 			{
 				auto d = decoder->build(i);
 
-				for (int fragNum = 0; fragNum < fragments.size() && !d->is_complete(); fragNum++)
+				for (unsigned int fragNum = 0; fragNum < fragments.size() && !d->is_complete(); fragNum++)
 				{
 					vector<uint8_t> payload;