diff --git a/.vs/msvc/uefi-simple.vcxproj b/.vs/msvc/uefi-simple.vcxproj
index dc78731..c4ac395 100644
--- a/.vs/msvc/uefi-simple.vcxproj
+++ b/.vs/msvc/uefi-simple.vcxproj
@@ -154,7 +154,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)inc;$(SolutionDir)\gnu-efi\inc;$(SolutionDir)\gnu-efi\inc\x86_64</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_UNICODE;UNICODE;HAVE_USE_MS_ABI;GNU_EFI_USE_EXTERNAL_STDARG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>false</ExceptionHandling>
       <CompileAs>CompileAsC</CompileAs>
@@ -386,11 +386,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\main.c" />
+    <ClCompile Include="..\..\src\bootloader.c" />
+    <ClCompile Include="..\..\src\gfx.c" />
+    <ClCompile Include="..\..\src\main.c" />
+    <ClCompile Include="..\..\src\memory.c" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\debug.vbs" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\inc\ELF.h" />
+    <ClInclude Include="BL.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/.vs/msvc/uefi-simple.vcxproj.filters b/.vs/msvc/uefi-simple.vcxproj.filters
index 409073d..0c05411 100644
--- a/.vs/msvc/uefi-simple.vcxproj.filters
+++ b/.vs/msvc/uefi-simple.vcxproj.filters
@@ -19,8 +19,25 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\main.c">
+    <ClCompile Include="..\..\src\bootloader.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gfx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\main.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\memory.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\inc\ELF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/.vs/uefi-simple/v15/ipch/AutoPCH/87c6e8ee158dd2c4/MAIN.ipch b/.vs/uefi-simple/v15/ipch/AutoPCH/87c6e8ee158dd2c4/MAIN.ipch
index ceed3db..5c7d219 100644
Binary files a/.vs/uefi-simple/v15/ipch/AutoPCH/87c6e8ee158dd2c4/MAIN.ipch and b/.vs/uefi-simple/v15/ipch/AutoPCH/87c6e8ee158dd2c4/MAIN.ipch differ
diff --git a/x64/Debug/gnu-efi.lib b/x64/Debug/gnu-efi.lib
index eee027a..1d3e175 100644
Binary files a/x64/Debug/gnu-efi.lib and b/x64/Debug/gnu-efi.lib differ
diff --git a/x64/Debug/gnu-efi.pdb b/x64/Debug/gnu-efi.pdb
index e21e218..d7c7e7a 100644
Binary files a/x64/Debug/gnu-efi.pdb and b/x64/Debug/gnu-efi.pdb differ
diff --git a/x64/Debug/gnu-efi/boxdraw.obj b/x64/Debug/gnu-efi/boxdraw.obj
index 0c2a3d1..d637b9c 100644
Binary files a/x64/Debug/gnu-efi/boxdraw.obj and b/x64/Debug/gnu-efi/boxdraw.obj differ
diff --git a/x64/Debug/gnu-efi/cmdline.obj b/x64/Debug/gnu-efi/cmdline.obj
index 5d68fd3..b36b1e9 100644
Binary files a/x64/Debug/gnu-efi/cmdline.obj and b/x64/Debug/gnu-efi/cmdline.obj differ
diff --git a/x64/Debug/gnu-efi/console.obj b/x64/Debug/gnu-efi/console.obj
index 6b61981..4ad5d2b 100644
Binary files a/x64/Debug/gnu-efi/console.obj and b/x64/Debug/gnu-efi/console.obj differ
diff --git a/x64/Debug/gnu-efi/crc.obj b/x64/Debug/gnu-efi/crc.obj
index ef57bbd..a27e015 100644
Binary files a/x64/Debug/gnu-efi/crc.obj and b/x64/Debug/gnu-efi/crc.obj differ
diff --git a/x64/Debug/gnu-efi/data.obj b/x64/Debug/gnu-efi/data.obj
index 4241c71..e63a238 100644
Binary files a/x64/Debug/gnu-efi/data.obj and b/x64/Debug/gnu-efi/data.obj differ
diff --git a/x64/Debug/gnu-efi/debug.obj b/x64/Debug/gnu-efi/debug.obj
index 6c95ba4..acb3394 100644
Binary files a/x64/Debug/gnu-efi/debug.obj and b/x64/Debug/gnu-efi/debug.obj differ
diff --git a/x64/Debug/gnu-efi/dpath.obj b/x64/Debug/gnu-efi/dpath.obj
index efe560b..1c5c04f 100644
Binary files a/x64/Debug/gnu-efi/dpath.obj and b/x64/Debug/gnu-efi/dpath.obj differ
diff --git a/x64/Debug/gnu-efi/efirtlib.obj b/x64/Debug/gnu-efi/efirtlib.obj
index 8a15d94..5c57b3a 100644
Binary files a/x64/Debug/gnu-efi/efirtlib.obj and b/x64/Debug/gnu-efi/efirtlib.obj differ
diff --git a/x64/Debug/gnu-efi/error.obj b/x64/Debug/gnu-efi/error.obj
index 9a5997c..68e0af9 100644
Binary files a/x64/Debug/gnu-efi/error.obj and b/x64/Debug/gnu-efi/error.obj differ
diff --git a/x64/Debug/gnu-efi/event.obj b/x64/Debug/gnu-efi/event.obj
index a10e975..b5dfb7b 100644
Binary files a/x64/Debug/gnu-efi/event.obj and b/x64/Debug/gnu-efi/event.obj differ
diff --git a/x64/Debug/gnu-efi/gnu-efi.pdb b/x64/Debug/gnu-efi/gnu-efi.pdb
index e21e218..d7c7e7a 100644
Binary files a/x64/Debug/gnu-efi/gnu-efi.pdb and b/x64/Debug/gnu-efi/gnu-efi.pdb differ
diff --git a/x64/Debug/gnu-efi/guid.obj b/x64/Debug/gnu-efi/guid.obj
index e0a3b60..dbf3f40 100644
Binary files a/x64/Debug/gnu-efi/guid.obj and b/x64/Debug/gnu-efi/guid.obj differ
diff --git a/x64/Debug/gnu-efi/hand.obj b/x64/Debug/gnu-efi/hand.obj
index 0eae815..3e22276 100644
Binary files a/x64/Debug/gnu-efi/hand.obj and b/x64/Debug/gnu-efi/hand.obj differ
diff --git a/x64/Debug/gnu-efi/hw.obj b/x64/Debug/gnu-efi/hw.obj
index dc858e2..94710b5 100644
Binary files a/x64/Debug/gnu-efi/hw.obj and b/x64/Debug/gnu-efi/hw.obj differ
diff --git a/x64/Debug/gnu-efi/init.obj b/x64/Debug/gnu-efi/init.obj
index bb17c2e..afd2803 100644
Binary files a/x64/Debug/gnu-efi/init.obj and b/x64/Debug/gnu-efi/init.obj differ
diff --git a/x64/Debug/gnu-efi/initplat.obj b/x64/Debug/gnu-efi/initplat.obj
index 83ed53a..a304be4 100644
Binary files a/x64/Debug/gnu-efi/initplat.obj and b/x64/Debug/gnu-efi/initplat.obj differ
diff --git a/x64/Debug/gnu-efi/lock.obj b/x64/Debug/gnu-efi/lock.obj
index 8eb72a1..31053e5 100644
Binary files a/x64/Debug/gnu-efi/lock.obj and b/x64/Debug/gnu-efi/lock.obj differ
diff --git a/x64/Debug/gnu-efi/math.obj b/x64/Debug/gnu-efi/math.obj
index 0ad002c..bf0a56e 100644
Binary files a/x64/Debug/gnu-efi/math.obj and b/x64/Debug/gnu-efi/math.obj differ
diff --git a/x64/Debug/gnu-efi/misc.obj b/x64/Debug/gnu-efi/misc.obj
index b5ce91a..a633553 100644
Binary files a/x64/Debug/gnu-efi/misc.obj and b/x64/Debug/gnu-efi/misc.obj differ
diff --git a/x64/Debug/gnu-efi/print.obj b/x64/Debug/gnu-efi/print.obj
index c40493d..680201e 100644
Binary files a/x64/Debug/gnu-efi/print.obj and b/x64/Debug/gnu-efi/print.obj differ
diff --git a/x64/Debug/gnu-efi/rtdata.obj b/x64/Debug/gnu-efi/rtdata.obj
index 55a06c4..511c2ca 100644
Binary files a/x64/Debug/gnu-efi/rtdata.obj and b/x64/Debug/gnu-efi/rtdata.obj differ
diff --git a/x64/Debug/gnu-efi/rtlock.obj b/x64/Debug/gnu-efi/rtlock.obj
index 9b749ea..7f36b8e 100644
Binary files a/x64/Debug/gnu-efi/rtlock.obj and b/x64/Debug/gnu-efi/rtlock.obj differ
diff --git a/x64/Debug/gnu-efi/rtstr.obj b/x64/Debug/gnu-efi/rtstr.obj
index fece20f..009a31c 100644
Binary files a/x64/Debug/gnu-efi/rtstr.obj and b/x64/Debug/gnu-efi/rtstr.obj differ
diff --git a/x64/Debug/gnu-efi/smbios.obj b/x64/Debug/gnu-efi/smbios.obj
index 7c515ba..3edc3d3 100644
Binary files a/x64/Debug/gnu-efi/smbios.obj and b/x64/Debug/gnu-efi/smbios.obj differ
diff --git a/x64/Debug/gnu-efi/sread.obj b/x64/Debug/gnu-efi/sread.obj
index 04358c9..219e1af 100644
Binary files a/x64/Debug/gnu-efi/sread.obj and b/x64/Debug/gnu-efi/sread.obj differ
diff --git a/x64/Debug/gnu-efi/str.obj b/x64/Debug/gnu-efi/str.obj
index 9fe71f7..fe23ff2 100644
Binary files a/x64/Debug/gnu-efi/str.obj and b/x64/Debug/gnu-efi/str.obj differ
diff --git a/x64/Debug/gnu-efi/vm.obj b/x64/Debug/gnu-efi/vm.obj
index a716054..ae08596 100644
Binary files a/x64/Debug/gnu-efi/vm.obj and b/x64/Debug/gnu-efi/vm.obj differ
diff --git a/x64/Debug/uefi-simple.pdb b/x64/Debug/uefi-simple.pdb
index 51bf14a..055a218 100644
Binary files a/x64/Debug/uefi-simple.pdb and b/x64/Debug/uefi-simple.pdb differ
diff --git a/x64/Debug/uefi-simple/main.obj b/x64/Debug/uefi-simple/main.obj
index ca668f3..4f48ad9 100644
Binary files a/x64/Debug/uefi-simple/main.obj and b/x64/Debug/uefi-simple/main.obj differ
diff --git a/x64/Debug/uefi-simple/uefi-simple.log b/x64/Debug/uefi-simple/uefi-simple.log
index d214372..7a49f8f 100644
--- a/x64/Debug/uefi-simple/uefi-simple.log
+++ b/x64/Debug/uefi-simple/uefi-simple.log
@@ -1,2 +1,14 @@
-  main.c
+  bootloader.c
+c:\users\gem\documents\red\src\bootloader.c(221): warning C4022: 'Compare': pointer mismatch for actual parameter 2
+c:\users\gem\documents\red\src\bootloader.c(226): warning C4022: 'Compare': pointer mismatch for actual parameter 2
+c:\users\gem\documents\red\src\bootloader.c(373): warning C4133: 'function': incompatible types - from 'char [43]' to 'CHAR16 *'
+c:\users\gem\documents\red\src\bootloader.c(641): warning C4013: 'FindFreeAddress_ByPage' undefined; assuming extern returning int
+  gfx.c
+c:\users\gem\documents\red\src\gfx.c(642): warning C4047: 'function': 'BOOLEAN' differs in levels of indirection from 'void *'
+c:\users\gem\documents\red\src\gfx.c(642): warning C4024: 'function through pointer': different types for formal and actual parameter 2
+c:\users\gem\documents\red\src\gfx.c(645): warning C4047: 'function': 'BOOLEAN' differs in levels of indirection from 'void *'
+c:\users\gem\documents\red\src\gfx.c(645): warning C4024: 'function through pointer': different types for formal and actual parameter 2
+c:\users\gem\documents\red\src\gfx.c(45): warning C4101: 'GfxInfoSize': unreferenced local variable
+  Generating Code...
+c:\users\gem\documents\red\src\bootloader.c(1445): warning C4700: uninitialized local variable 'LoaderBlock' used
   uefi-simple.vcxproj -> C:\Users\Gem\Documents\red\x64\Debug\uefi-simple.efi
diff --git a/x64/Debug/uefi-simple/uefi-simple.tlog/CL.command.1.tlog b/x64/Debug/uefi-simple/uefi-simple.tlog/CL.command.1.tlog
index 437e717..eea912e 100644
Binary files a/x64/Debug/uefi-simple/uefi-simple.tlog/CL.command.1.tlog and b/x64/Debug/uefi-simple/uefi-simple.tlog/CL.command.1.tlog differ
diff --git a/x64/Debug/uefi-simple/uefi-simple.tlog/CL.read.1.tlog b/x64/Debug/uefi-simple/uefi-simple.tlog/CL.read.1.tlog
index 8fe7513..f2b5d8e 100644
Binary files a/x64/Debug/uefi-simple/uefi-simple.tlog/CL.read.1.tlog and b/x64/Debug/uefi-simple/uefi-simple.tlog/CL.read.1.tlog differ
diff --git a/x64/Debug/uefi-simple/uefi-simple.tlog/CL.write.1.tlog b/x64/Debug/uefi-simple/uefi-simple.tlog/CL.write.1.tlog
index 17cce0f..4c7a505 100644
Binary files a/x64/Debug/uefi-simple/uefi-simple.tlog/CL.write.1.tlog and b/x64/Debug/uefi-simple/uefi-simple.tlog/CL.write.1.tlog differ
diff --git a/x64/Debug/uefi-simple/uefi-simple.tlog/link.command.1.tlog b/x64/Debug/uefi-simple/uefi-simple.tlog/link.command.1.tlog
index b0b1b38..c454c73 100644
Binary files a/x64/Debug/uefi-simple/uefi-simple.tlog/link.command.1.tlog and b/x64/Debug/uefi-simple/uefi-simple.tlog/link.command.1.tlog differ
diff --git a/x64/Debug/uefi-simple/uefi-simple.tlog/link.read.1.tlog b/x64/Debug/uefi-simple/uefi-simple.tlog/link.read.1.tlog
index b136742..761edf9 100644
Binary files a/x64/Debug/uefi-simple/uefi-simple.tlog/link.read.1.tlog and b/x64/Debug/uefi-simple/uefi-simple.tlog/link.read.1.tlog differ
diff --git a/x64/Debug/uefi-simple/uefi-simple.tlog/link.write.1.tlog b/x64/Debug/uefi-simple/uefi-simple.tlog/link.write.1.tlog
index 748c833..1ea48f7 100644
Binary files a/x64/Debug/uefi-simple/uefi-simple.tlog/link.write.1.tlog and b/x64/Debug/uefi-simple/uefi-simple.tlog/link.write.1.tlog differ
diff --git a/x64/Debug/uefi-simple/vc141.pdb b/x64/Debug/uefi-simple/vc141.pdb
index 8f5e306..58f71ba 100644
Binary files a/x64/Debug/uefi-simple/vc141.pdb and b/x64/Debug/uefi-simple/vc141.pdb differ