diff --git a/GleeBug/Debugger.Breakpoint.h b/GleeBug/Debugger.Breakpoint.h
index 6b9b6f3..669e7b8 100644
--- a/GleeBug/Debugger.Breakpoint.h
+++ b/GleeBug/Debugger.Breakpoint.h
@@ -49,14 +49,6 @@ namespace GleeBug
         Execute
     };
 
-    struct MemoryBreakpointInfo
-    {
-        struct
-        {
-            uint32 offset;
-        } info[PAGE_SIZE];
-    };
-
     /**
     \brief Structure describing internal breakpoint info.
     */
@@ -81,7 +73,6 @@ namespace GleeBug
             {
                 MemoryType type;
                 ptr size;
-                MemoryBreakpointInfo* info;
             } memory;
         };
     };
diff --git a/GleeBug/Debugger.Global.h b/GleeBug/Debugger.Global.h
index 371625b..64c9d2e 100644
--- a/GleeBug/Debugger.Global.h
+++ b/GleeBug/Debugger.Global.h
@@ -35,6 +35,7 @@ namespace GleeBug
     typedef std::map<BreakpointKey, BreakpointInfo> BreakpointMap;
     typedef std::map<BreakpointKey, BreakpointCallback> BreakpointCallbackMap;
     typedef std::unordered_map<ptr, BreakpointMap::iterator> SoftwareBreakpointMap;
+    typedef std::set<Range, RangeCompare> MemoryBreakpointSet;
 
     //vector typedefs
     typedef std::vector<StepCallback> StepCallbackVector;
diff --git a/GleeBug/Debugger.Process.h b/GleeBug/Debugger.Process.h
index 9881bc2..f91e3e3 100644
--- a/GleeBug/Debugger.Process.h
+++ b/GleeBug/Debugger.Process.h
@@ -30,6 +30,7 @@ namespace GleeBug
         SoftwareBreakpointMap softwareBreakpointReferences;
         BreakpointCallbackMap breakpointCallbacks;
         BreakpointInfo hardwareBreakpoints[4];
+        MemoryBreakpointSet memoryBreakpoints;
 
         /**
         \brief Constructor.