diff --git a/dfhack/python/pydfhack/map.py b/dfhack/python/pydfhack/map.py
index 944aa1fe0..41953882c 100644
--- a/dfhack/python/pydfhack/map.py
+++ b/dfhack/python/pydfhack/map.py
@@ -3,23 +3,82 @@
 Python class for DF_Hack::Maps
 """
 from ._pydfhack import _MapManager
-class Map(_MapManager):
+from .mixins import NeedsStart
+from .decorators import suspend
+
+class Map(NeedsStart, _MapManager):
     api = None
-    started = False
+    cls = _MapManager
     def __init__(self, api, *args, **kwds):
-        _MapManager.__init__(self, args, kwds)
+        self.cls.__init__(self, args, kwds)
         self.api = api
 
-    def prepare(self):
+    @suspend
+    def Write_Tile_Types(self, x=0, y=0, z=0, tiles=None, point=None):
+        if point:
+            point = point.get_block()
+            x, y, z = point.xyz        
+        return self.cls.Write_Tile_Types(self, x, y, z, tiles)
+
+    @suspend
+    def Write_Occupancy(self, *args, **kw):
+        return self.cls.Write_Occupancy(self, *args, **kw)
+
+    @suspend
+    def Read_Tile_Types(self, x=0, y=0, z=0, point=None):
         """
-        Enforce Suspend/Start
+        Returns 16x16 block in form of list of lists.
+        Should be called either by point or x,y,z coords. Coords are in block form.
         """
-        if self.api.prepare():
-            if not self.started:
-                self.started = self.Start()
-            return self.started
-        else:
-            return False
-                
-        
+        if point:
+            point = point.get_block()
+            x, y, z = point.xyz
+        return self.cls.Read_Tile_Types(self, x, y, z)
+
+    @suspend
+    def Is_Valid_Block(self, *args, **kw):
+        return self.cls.Is_Valid_Block(self, *args, **kw)
+
+    @suspend
+    def Write_Dirty_Bit(self, *args, **kw):
+        return self.cls.Write_Dirty_Bit(self, *args, **kw)
+
+    @suspend
+    def Read_Designations(self, *args, **kw):
+        return self.cls.Read_Designations(self, *args, **kw)
+
+    @suspend
+    def Write_Block_Flags(self, *args, **kw):
+        return self.cls.Write_Block_Flags(self, *args, **kw)
+
+    @suspend
+    def Write_Designations(self, *args, **kw):
+        return self.cls.Write_Designations(self, *args, **kw)
+
+    @suspend
+    def Read_Region_Offsets(self, *args, **kw):
+        return self.cls.Read_Region_Offsets(self, *args, **kw)
+
+    @suspend
+    def Read_Dirty_Bit(self, *args, **kw):
+        return self.cls.Read_Dirty_Bit(self, *args, **kw)
+
+    @suspend
+    def Read_Occupancy(self, *args, **kw):
+        return self.cls.Read_Occupancy(self, *args, **kw)
+
+    @suspend
+    def Read_Block_Flags(self, *args, **kw):
+        return self.cls.Read_Block_Flags(self, *args, **kw)
+
+    @suspend
+    def Read_Geology(self, *args, **kw):
+        return self.cls.Read_Geology(self, *args, **kw)
+
+    @suspend
+    def Read_Block_40d(self, *args, **kw):
+        return self.cls.Read_Block_40d(self, *args, **kw)
 
+    @suspend
+    def get_size(self):
+        return self.size