diff --git a/Projects/CodeBlocks/SleepyHead.cbp b/Projects/CodeBlocks/SleepyHead.cbp
index 389c23f0..d67833c7 100644
--- a/Projects/CodeBlocks/SleepyHead.cbp
+++ b/Projects/CodeBlocks/SleepyHead.cbp
@@ -14,6 +14,8 @@
 				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-g" />
+					<Add directory="../../src/libs" />
+					<Add directory="../../src" />
 				</Compiler>
 			</Target>
 			<Target title="Release">
@@ -42,6 +44,8 @@
 					<Add option="-march=i686" />
 					<Add option="-O2" />
 					<Add option="`i686-pc-mingw32-wx-config --version=2.9 --cflags`" />
+					<Add directory="../../src/libs" />
+					<Add directory="../../src" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -58,34 +62,34 @@
 		<Linker>
 			<Add option="`wx-config --version=2.8 --libs aui,xrc,qa,html,adv,core,net,base`" />
 		</Linker>
-		<Unit filename="GUIFrame.cpp" />
-		<Unit filename="GUIFrame.h" />
-		<Unit filename="SleepyHeadApp.cpp" />
-		<Unit filename="SleepyHeadApp.h" />
-		<Unit filename="SleepyHeadMain.cpp" />
-		<Unit filename="SleepyHeadMain.h" />
-		<Unit filename="WxWizFrame.fbp" />
-		<Unit filename="graphs/graph.cpp" />
-		<Unit filename="graphs/graph.h" />
-		<Unit filename="libs/sleeplib/binary_file.cpp" />
-		<Unit filename="libs/sleeplib/binary_file.h" />
-		<Unit filename="libs/sleeplib/machine.cpp" />
-		<Unit filename="libs/sleeplib/machine.h" />
-		<Unit filename="libs/sleeplib/machine_loader.cpp" />
-		<Unit filename="libs/sleeplib/machine_loader.h" />
-		<Unit filename="libs/sleeplib/preferences.cpp" />
-		<Unit filename="libs/sleeplib/preferences.h" />
-		<Unit filename="libs/sleeplib/profiles.cpp" />
-		<Unit filename="libs/sleeplib/profiles.h" />
-		<Unit filename="libs/sleeplib/prs1_loader.cpp" />
-		<Unit filename="libs/sleeplib/prs1_loader.h" />
-		<Unit filename="libs/tinyxml/tinystr.cpp" />
-		<Unit filename="libs/tinyxml/tinystr.h" />
-		<Unit filename="libs/tinyxml/tinyxml.cpp" />
-		<Unit filename="libs/tinyxml/tinyxml.h" />
-		<Unit filename="libs/tinyxml/tinyxmlerror.cpp" />
-		<Unit filename="libs/tinyxml/tinyxmlparser.cpp" />
-		<Unit filename="version.h" />
+		<Unit filename="../../src/GUIFrame.cpp" />
+		<Unit filename="../../src/GUIFrame.h" />
+		<Unit filename="../../src/SleepyHeadApp.cpp" />
+		<Unit filename="../../src/SleepyHeadApp.h" />
+		<Unit filename="../../src/SleepyHeadMain.cpp" />
+		<Unit filename="../../src/SleepyHeadMain.h" />
+		<Unit filename="../../src/WxWizFrame.fbp" />
+		<Unit filename="../../src/graphs/graph.cpp" />
+		<Unit filename="../../src/graphs/graph.h" />
+		<Unit filename="../../src/libs/sleeplib/binary_file.cpp" />
+		<Unit filename="../../src/libs/sleeplib/binary_file.h" />
+		<Unit filename="../../src/libs/sleeplib/machine.cpp" />
+		<Unit filename="../../src/libs/sleeplib/machine.h" />
+		<Unit filename="../../src/libs/sleeplib/machine_loader.cpp" />
+		<Unit filename="../../src/libs/sleeplib/machine_loader.h" />
+		<Unit filename="../../src/libs/sleeplib/preferences.cpp" />
+		<Unit filename="../../src/libs/sleeplib/preferences.h" />
+		<Unit filename="../../src/libs/sleeplib/profiles.cpp" />
+		<Unit filename="../../src/libs/sleeplib/profiles.h" />
+		<Unit filename="../../src/libs/sleeplib/prs1_loader.cpp" />
+		<Unit filename="../../src/libs/sleeplib/prs1_loader.h" />
+		<Unit filename="../../src/libs/tinyxml/tinystr.cpp" />
+		<Unit filename="../../src/libs/tinyxml/tinystr.h" />
+		<Unit filename="../../src/libs/tinyxml/tinyxml.cpp" />
+		<Unit filename="../../src/libs/tinyxml/tinyxml.h" />
+		<Unit filename="../../src/libs/tinyxml/tinyxmlerror.cpp" />
+		<Unit filename="../../src/libs/tinyxml/tinyxmlparser.cpp" />
+		<Unit filename="../../src/version.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend
index 173a9367..bbb2d8cd 100644
--- a/Projects/CodeBlocks/SleepyHead.depend
+++ b/Projects/CodeBlocks/SleepyHead.depend
@@ -8201,3 +8201,209 @@
 	"wx/treebase.h"
 	"wx/hashmap.h"
 
+1307245704 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp
+	"wx/wxprec.h"
+	<wx/wx.h>
+	"GUIFrame.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/GUIFrame.h
+	<wx/intl.h>
+	<wx/string.h>
+	<wx/bitmap.h>
+	<wx/image.h>
+	<wx/icon.h>
+	<wx/menu.h>
+	<wx/gdicmn.h>
+	<wx/font.h>
+	<wx/colour.h>
+	<wx/settings.h>
+	<wx/statusbr.h>
+	<wx/aui/auibook.h>
+	<wx/frame.h>
+	<wx/aui/aui.h>
+	<wx/calctrl.h>
+	<wx/sizer.h>
+	<wx/scrolwin.h>
+	<wx/panel.h>
+	<wx/html/htmlwin.h>
+	<wx/radiobut.h>
+	<wx/stattext.h>
+	<wx/datectrl.h>
+	<wx/dateevt.h>
+
+1307245852 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp
+	"wx_pch.h"
+	<iostream>
+	<wx/log.h>
+	<wx/progdlg.h>
+	<wx/datetime.h>
+	<wx/fs_mem.h>
+	"SleepyHeadApp.h"
+	"SleepyHeadMain.h"
+	"version.h"
+	"sleeplib/prs1_loader.h"
+	"sleeplib/profiles.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/SleepyHeadApp.h
+	<wx/app.h>
+
+1307245704 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h
+	<wx/listbox.h>
+	<wx/treectrl.h>
+	"SleepyHeadApp.h"
+	"GUIFrame.h"
+	"sleeplib/machine.h"
+	"graphs/graph.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.h
+	<wx/string.h>
+	<wx/variant.h>
+	<wx/dir.h>
+	<wx/filename.h>
+	<wx/ffile.h>
+	<wx/utils.h>
+	<map>
+	<vector>
+	<list>
+	"tinyxml/tinyxml.h"
+	"preferences.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxml.h
+	<ctype.h>
+	<stdio.h>
+	<stdlib.h>
+	<string.h>
+	<assert.h>
+	<string>
+	<iostream>
+	<sstream>
+	"tinystr.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinystr.h
+	<assert.h>
+	<string.h>
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/preferences.h
+	<wx/string.h>
+	<wx/variant.h>
+	<map>
+	"tinyxml/tinyxml.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/graphs/graph.h
+	<sleeplib/machine.h>
+	<list>
+
+1307245704 /home/mark/projects/git/sleepyhead/src/version.h
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
+	"machine.h"
+	"machine_loader.h"
+	"profiles.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.h
+	"profiles.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.h
+	<wx/string.h>
+	<map>
+	"machine.h"
+	"preferences.h"
+	"tinyxml/tinyxml.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
+	"wx_pch.h"
+	"version.h"
+	<wx/app.h>
+	<wx/icon.h>
+	<wx/msgdlg.h>
+	<wx/dirdlg.h>
+	<wx/progdlg.h>
+	<wx/bitmap.h>
+	<wx/log.h>
+	<wx/dcscreen.h>
+	<wx/dcmemory.h>
+	<wx/filedlg.h>
+	<wx/fs_mem.h>
+	<wx/aui/aui.h>
+	"SleepyHeadMain.h"
+	"sleeplib/profiles.h"
+	"sleeplib/machine_loader.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
+	<wx/settings.h>
+	<wx/dcbuffer.h>
+	<wx/log.h>
+	"graph.h"
+	"sleeplib/profiles.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/binary_file.cpp
+	<wx/filename.h>
+	"binary_file.h"
+
+1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/binary_file.h
+	<wx/ffile.h>
+	<wx/utils.h>
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp
+	<tr1/random>
+	<wx/colour.h>
+	<wx/log.h>
+	<wx/progdlg.h>
+	"binary_file.h"
+	"machine.h"
+	"profiles.h"
+	<algorithm>
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine_loader.cpp
+	"machine_loader.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/preferences.cpp
+	<wx/wx.h>
+	<wx/filename.h>
+	<wx/string.h>
+	<wx/variant.h>
+	<wx/stdpaths.h>
+	"preferences.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp
+	<wx/filefn.h>
+	<wx/filename.h>
+	<wx/utils.h>
+	<wx/dir.h>
+	<wx/log.h>
+	"preferences.h"
+	"profiles.h"
+	"machine.h"
+	"machine_loader.h"
+	"tinyxml/tinyxml.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp
+	<wx/dir.h>
+	<wx/filename.h>
+	<wx/ffile.h>
+	<wx/textfile.h>
+	<wx/string.h>
+	<wx/datetime.h>
+	<wx/log.h>
+	<wx/progdlg.h>
+	<wx/msgdlg.h>
+	"prs1_loader.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinystr.cpp
+	"tinystr.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxml.cpp
+	<ctype.h>
+	<sstream>
+	<iostream>
+	"tinyxml.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxmlerror.cpp
+	"tinyxml.h"
+
+1307245704 source:/home/mark/projects/git/sleepyhead/src/libs/tinyxml/tinyxmlparser.cpp
+	<ctype.h>
+	<stddef.h>
+	"tinyxml.h"
+	<windows.h>
+
diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout
index d5cbbeb9..ffd76ea8 100644
--- a/Projects/CodeBlocks/SleepyHead.layout
+++ b/Projects/CodeBlocks/SleepyHead.layout
@@ -1,67 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
-	<ActiveTarget name="Debug" />
-	<File name="GUIFrame.cpp" open="0" top="0" tabpos="11">
-		<Cursor position="8034" topLine="105" />
+	<ActiveTarget name="Windows" />
+	<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
+		<Cursor position="509" topLine="0" />
 	</File>
-	<File name="GUIFrame.h" open="0" top="0" tabpos="10">
-		<Cursor position="2555" topLine="27" />
+	<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
+		<Cursor position="805" topLine="0" />
 	</File>
-	<File name="SleepyHeadApp.cpp" open="1" top="0" tabpos="10">
-		<Cursor position="1061" topLine="14" />
-	</File>
-	<File name="SleepyHeadMain.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="26665" topLine="735" />
-	</File>
-	<File name="SleepyHeadMain.h" open="1" top="0" tabpos="4">
-		<Cursor position="2793" topLine="67" />
-	</File>
-	<File name="graphs/graph.cpp" open="1" top="0" tabpos="6">
-		<Cursor position="27211" topLine="1036" />
-	</File>
-	<File name="graphs/graph.h" open="1" top="0" tabpos="5">
-		<Cursor position="2182" topLine="42" />
-	</File>
-	<File name="libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/binary_file.h" open="0" top="0" tabpos="14">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1">
-		<Cursor position="4983" topLine="84" />
-	</File>
-	<File name="libs/sleeplib/machine.h" open="1" top="1" tabpos="2">
-		<Cursor position="148" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/machine_loader.cpp" open="0" top="0" tabpos="8">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/machine_loader.h" open="0" top="0" tabpos="15">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/preferences.cpp" open="0" top="0" tabpos="9">
-		<Cursor position="5120" topLine="14" />
-	</File>
-	<File name="libs/sleeplib/preferences.h" open="0" top="0" tabpos="16">
-		<Cursor position="31" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="7">
-		<Cursor position="6582" topLine="216" />
-	</File>
-	<File name="libs/sleeplib/profiles.h" open="1" top="0" tabpos="8">
-		<Cursor position="628" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="9">
-		<Cursor position="458" topLine="0" />
-	</File>
-	<File name="libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="8">
-		<Cursor position="1115" topLine="0" />
-	</File>
-	<File name="libs/tinyxml/tinystr.cpp" open="0" top="0" tabpos="13">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="version.h" open="0" top="0" tabpos="11">
-		<Cursor position="0" topLine="0" />
+	<File name="../../src/SleepyHeadMain.h" open="1" top="1" tabpos="3">
+		<Cursor position="546" topLine="0" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/src/SleepyHeadApp.cpp b/src/SleepyHeadApp.cpp
index 88c54e52..36b658c7 100644
--- a/src/SleepyHeadApp.cpp
+++ b/src/SleepyHeadApp.cpp
@@ -35,16 +35,19 @@ bool SleepyHeadApp::OnInit()
 {
     // Initialize the logger
 
+#if defined(wxUSE_STD_IOSTREAM)
+    // Standard bottled linux build, plus my WXMSW build needs it
+    wxLog *logger=new wxLogStream(&std::cout);
+    wxLog::SetActiveTarget(logger);
+#else
 	// wxLogStream requires wxWidgets to be built with wxUSE_STD_IOSTREAM which is not default
-    //wxLog *logger=new wxLogStream(&std::cout);
-    //wxLog::SetActiveTarget(logger);
-	
 	// use STDERR for wxLogging for better portability for now
-	wxLogStderr(NULL);
-	
+	wxLogStderr(NULL);
+#endif
+
 	wxLogDebug( wxVERSION_STRING );
 	wxLogDebug( wxT("Application Initialze...") );
-	
+
 
    // wxFileSystem::AddHandler(new wxMemoryFSHandler);