diff --git a/src/maze/mz_hamiltonian.scad b/src/maze/mz_hamiltonian.scad
index eb4f0ec8..2e903366 100644
--- a/src/maze/mz_hamiltonian.scad
+++ b/src/maze/mz_hamiltonian.scad
@@ -10,14 +10,19 @@
 
 use <_impl/_mz_hamiltonian_impl.scad>;
 use <mz_square_cells.scad>;
+use <mz_square_initialize.scad>;
 use <mz_square_get.scad>;
 use <../util/sort.scad>;
 use <../util/dedup.scad>;
 
-function mz_hamiltonian(rows, columns, start = [0, 0], seed) =
+function mz_hamiltonian(rows, columns, start = [0, 0], init_cells, seed) =
     let(
-        cells = mz_square_cells(  
-            rows, columns,
+        r = is_undef(init_cells) ? rows : len(init_cells),
+        c = is_undef(init_cells) ? columns : len(init_cells[0]),
+        cells = mz_square_cells(
+            r, c,
+            init_cells = init_cells,
+            start = start,
             seed = seed
         ),
         all = concat(
@@ -30,11 +35,13 @@ function mz_hamiltonian(rows, columns, start = [0, 0], seed) =
                 )
                 each if(type == "TOP_WALL") _mz_hamiltonian_top(x, y) else
                      if(type == "RIGHT_WALL") _mz_hamiltonian_right(x, y) else
-                     if(type == "TOP_RIGHT_WALL") _mz_hamiltonian_top_right(x, y)
+                     if(type == "TOP_RIGHT_WALL") _mz_hamiltonian_top_right(x, y) else 
+                     if(type == "MASK") _mz_hamiltonian_mask(x, y)
+                     
             ],
-            [for(x = [0:columns * 2 - 1]) [x, 0]],
-            [for(y = [0:rows * 2 - 1]) [0, y]]
+            [for(x = [0:c * 2 - 1]) [x, 0]],
+            [for(y = [0:r * 2 - 1]) [0, y]]
         ),
         dot_pts = dedup(sort(all, by = "vt"))
     )
-    _mz_hamiltonian_travel(dot_pts, start, rows * columns * 4);
\ No newline at end of file
+    _mz_hamiltonian_travel(dot_pts, start * 3, r * c * 4);
\ No newline at end of file