diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend
index bbb2d8cd..88d82b7e 100644
--- a/Projects/CodeBlocks/SleepyHead.depend
+++ b/Projects/CodeBlocks/SleepyHead.depend
@@ -8255,7 +8255,7 @@
 	"sleeplib/machine.h"
 	"graphs/graph.h"
 
-1307245704 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.h
+1307272411 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.h
 	<wx/string.h>
 	<wx/variant.h>
 	<wx/dir.h>
@@ -8310,7 +8310,7 @@
 	"preferences.h"
 	"tinyxml/tinyxml.h"
 
-1307245704 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
+1307252474 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
 	"wx_pch.h"
 	"version.h"
 	<wx/app.h>
diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout
index ffd76ea8..1030f053 100644
--- a/Projects/CodeBlocks/SleepyHead.layout
+++ b/Projects/CodeBlocks/SleepyHead.layout
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
-	<ActiveTarget name="Windows" />
+	<ActiveTarget name="Debug" />
 	<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
-		<Cursor position="509" topLine="0" />
+		<Cursor position="781" topLine="0" />
 	</File>
-	<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
-		<Cursor position="805" topLine="0" />
+	<File name="../../src/SleepyHeadMain.cpp" open="1" top="1" tabpos="2">
+		<Cursor position="5611" topLine="196" />
 	</File>
-	<File name="../../src/SleepyHeadMain.h" open="1" top="1" tabpos="3">
+	<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3">
 		<Cursor position="546" topLine="0" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp
index d5592c0c..39298c50 100644
--- a/src/SleepyHeadMain.cpp
+++ b/src/SleepyHeadMain.cpp
@@ -204,12 +204,12 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event )
     wxRect r=GetRect();
 
 #if defined(__UNIX__) // Borrowed.. this need fixing.
-    /*int cx=r.x, cy=r.y;
+    int cx=r.x, cy=r.y;
     ClientToScreen(&cx,&cy);
     int border_width = cx - r.x;
     int title_bar_height = cy - r.y;
     r.width += (border_width * 2);
-    r.height += title_bar_height + border_width; */
+    r.height += title_bar_height; // + border_width;
 #endif
 
     wxScreenDC sdc;
@@ -677,7 +677,6 @@ void Daily::OnEventTreeSelection( wxTreeEvent& event )
         SF->SetXBounds(st,et);
         PRD->SetXBounds(st,et);
         LEAK->SetXBounds(st,et);
-        wxLogMessage(wxT("Tree Selected:")+d.Format());
     }
 }
 
diff --git a/src/libs/sleeplib/loader_plugins/cms50_loader.cpp b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp
new file mode 100644
index 00000000..b317b377
--- /dev/null
+++ b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp
@@ -0,0 +1,30 @@
+/*
+SleepLib CMS50X Loader Implementation
+
+Author: Mark Watkins <jedimark64@users.sourceforge.net>
+License: GPL
+*/
+
+#include "cms50_loader.h"
+
+CMS50Loader::CMS50Loader()
+{
+    //ctor
+}
+
+CMS50Loader::~CMS50Loader()
+{
+    //dtor
+}
+
+
+bool cms50_initialized=false;
+void CMS50Loader::Register()
+{
+    if (cms50_initialized) return;
+    wxLogVerbose(wxT("Registering CMS50Loader"));
+    RegisterLoader(new CMS50Loader());
+    //InitModelMap();
+    cms50_initialized=true;
+}
+
diff --git a/src/libs/sleeplib/loader_plugins/cms50_loader.h b/src/libs/sleeplib/loader_plugins/cms50_loader.h
new file mode 100644
index 00000000..ddaced92
--- /dev/null
+++ b/src/libs/sleeplib/loader_plugins/cms50_loader.h
@@ -0,0 +1,26 @@
+/*
+SleepLib CMS50X Loader Header
+
+Author: Mark Watkins <jedimark64@users.sourceforge.net>
+License: GPL
+*/
+
+#ifndef CMS50LOADER_H
+#define CMS50LOADER_H
+
+#include <machine_loader.h>
+
+
+class CMS50Loader : public MachineLoader
+{
+    public:
+        CMS50Loader();
+        virtual ~CMS50Loader();
+        virtual bool Open(wxString & path,Profile *profile);
+        static void Register();
+
+    protected:
+    private:
+};
+
+#endif // CMS50LOADER_H
diff --git a/src/libs/sleeplib/machine.h b/src/libs/sleeplib/machine.h
index 8e6e9575..98ced224 100644
--- a/src/libs/sleeplib/machine.h
+++ b/src/libs/sleeplib/machine.h
@@ -59,6 +59,13 @@ enum MachineCode//:wxInt16
     PRS1_Unknown00, PRS1_Unknown01, PRS1_Unknown08, PRS1_Unknown09, PRS1_Unknown0B,	PRS1_Unknown0E, PRS1_Unknown10, PRS1_Unknown12,
     PRS1_SystemLockStatus, PRS1_SystemResistanceStatus, PRS1_SystemResistanceSetting, PRS1_HoseDiameter, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI,
 
+    // Oximeter Codes
+    OXI_Pulse=0x2000, OXI_SpO2, OXI_Plethy, OXI_Signal2, OXI_SignalGood,
+
+    ZEO_SleepStage=0x2800, ZEO_Waveform,
+
+
+
 };
 void InitMapsWithoutAwesomeInitializerLists();