diff --git a/Makefile b/Makefile
index d048267..a59429f 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ levels = \
   modules/game/levels/tutorial-4.scm \
   modules/game/levels/tutorial-5.scm \
   modules/game/levels/tutorial-6.scm \
+  modules/game/levels/tutorial-7.scm \
   modules/game/levels/level-1.scm \
   modules/game/levels/level-2.scm \
   modules/game/levels/level-3.scm \
diff --git a/game.scm b/game.scm
index 46bc2ac..453d941 100644
--- a/game.scm
+++ b/game.scm
@@ -35,6 +35,7 @@
              (game levels tutorial-4)
              (game levels tutorial-5)
              (game levels tutorial-6)
+             (game levels tutorial-7)
              (game levels level-1)
              (game levels level-2)
              (game levels level-3)
@@ -102,6 +103,7 @@
    load-tutorial-4
    load-tutorial-5
    load-tutorial-6
+   load-tutorial-7
    ;; load-level-1
    ;; load-level-2
    load-level-3
diff --git a/modules/game/levels/tutorial-6.tmx b/modules/game/levels/tutorial-6.tmx
index 857d7c4..a288b29 100644
--- a/modules/game/levels/tutorial-6.tmx
+++ b/modules/game/levels/tutorial-6.tmx
@@ -4,7 +4,7 @@
  <layer id="1" name="background" width="20" height="15">
   <data encoding="csv">
 151,110,111,90,210,129,211,111,211,190,169,130,209,90,189,191,191,89,110,131,
-210,210,91,149,131,170,171,190,91,131,209,109,110,91,131,209,171,209,171,90,
+210,210,91,149,131,170,171,190,91,131,209,109,110,91,131,209,171,112,171,90,
 91,129,91,190,91,149,129,209,89,91,130,91,209,89,211,150,150,211,169,90,
 191,91,81,82,82,82,82,82,82,83,82,82,82,84,90,191,131,90,130,109,
 131,189,105,24,24,24,24,24,24,31,24,24,24,86,110,90,209,110,91,191,
@@ -12,7 +12,7 @@
 211,191,85,24,24,24,24,24,24,24,24,24,24,107,83,83,82,84,149,149,
 191,150,85,24,3,3,3,3,24,3,3,3,24,31,31,31,28,86,109,171,
 170,211,85,24,24,24,24,24,24,24,24,24,24,31,31,31,24,106,190,131,
-189,130,85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,171,110,
+92,130,85,24,24,24,24,24,24,24,24,24,24,24,24,24,24,106,171,110,
 189,189,85,24,24,24,24,24,24,24,24,24,24,87,103,103,103,104,150,110,
 91,210,85,24,24,24,24,24,24,24,24,24,24,106,110,210,90,190,109,170,
 130,190,101,102,102,102,103,103,103,102,103,102,103,104,171,171,111,191,189,209,
diff --git a/modules/game/levels/tutorial-7.tmx b/modules/game/levels/tutorial-7.tmx
index c935eb5..4f831d2 100644
--- a/modules/game/levels/tutorial-7.tmx
+++ b/modules/game/levels/tutorial-7.tmx
@@ -1,61 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="36">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="20" height="15" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="50">
  <tileset firstgid="1" source="tiles.tsx"/>
  <layer id="1" name="background" width="20" height="15">
   <data encoding="csv">
-129,109,110,191,189,169,169,191,110,169,150,91,110,171,210,111,110,170,151,169,
-211,170,150,110,90,209,171,209,170,149,110,190,149,90,111,191,191,150,209,151,
-210,210,170,169,149,191,189,169,169,151,149,169,169,190,130,110,209,169,109,209,
-90,190,130,170,189,91,129,209,109,169,171,211,151,169,89,131,89,191,211,211,
-111,130,111,191,91,210,169,89,190,109,171,130,211,91,191,149,149,209,191,169,
-191,171,150,89,169,190,171,109,129,110,169,190,190,130,170,151,131,170,109,151,
-211,109,190,109,189,130,191,130,149,190,149,191,151,111,109,171,210,191,209,209,
-151,90,91,110,209,170,211,151,129,109,191,189,189,191,129,89,171,151,130,209,
-170,91,191,209,191,89,151,90,190,209,170,171,169,110,169,131,129,129,90,150,
-211,130,171,150,151,131,91,129,189,89,109,189,169,130,111,150,110,211,170,151,
-129,110,189,151,189,91,170,151,89,131,209,130,129,170,191,91,209,90,189,110,
-209,130,110,189,89,129,90,191,130,171,131,110,110,131,130,110,110,110,111,151,
-129,211,129,91,129,91,210,129,109,89,131,89,169,191,211,110,170,209,91,111,
-109,210,109,191,189,171,111,209,89,90,130,91,191,90,191,151,109,190,191,90,
-169,191,90,211,109,90,150,170,109,109,109,130,90,189,111,169,131,109,169,209
+190,169,105,24,24,24,106,171,111,150,111,112,105,24,24,24,106,131,171,111,
+89,170,105,24,24,24,106,109,171,189,90,151,105,24,28,24,86,129,211,190,
+82,82,108,31,24,31,106,110,130,189,129,110,105,31,31,31,107,82,82,82,
+3,24,31,24,24,24,86,209,89,111,91,111,105,24,3,3,3,3,3,3,
+24,24,24,24,24,24,107,83,82,83,82,83,108,3,24,24,24,24,24,24,
+24,24,31,24,24,24,31,24,24,24,24,24,24,24,24,24,24,24,24,24,
+102,102,88,24,24,24,3,3,24,24,24,3,3,24,24,24,87,103,103,102,
+151,92,85,3,3,24,24,24,31,24,24,24,24,24,3,24,106,131,151,169,
+170,189,85,24,24,24,3,3,24,24,24,3,24,24,24,24,86,169,109,129,
+90,171,85,24,24,24,24,24,24,24,24,24,24,24,24,24,86,150,170,190,
+151,129,105,24,24,24,24,24,24,24,24,24,24,24,24,24,86,151,109,151,
+89,189,105,24,24,24,24,24,24,24,24,24,24,24,24,24,106,129,210,151,
+211,110,85,31,24,31,87,102,102,102,103,103,88,31,24,31,106,210,169,171,
+171,171,85,24,24,24,106,130,130,171,111,189,85,24,24,24,106,90,110,209,
+171,91,105,24,24,24,86,190,149,211,131,210,85,24,24,24,106,191,111,111
 </data>
  </layer>
  <objectgroup id="2" name="objects">
-  <object id="1" type="player-spawn" gid="1" x="80" y="144" width="16" height="16"/>
-  <object id="7" type="gem" gid="29" x="208" y="64" width="16" height="16"/>
-  <object id="27" type="clock-emitter" gid="49" x="80" y="64" width="16" height="16">
+  <object id="1" type="player-spawn" gid="1" x="144" y="160" width="16" height="16"/>
+  <object id="7" type="gem" gid="29" x="64" y="64" width="16" height="16"/>
+  <object id="27" type="clock-emitter" gid="49" x="128" y="96" width="16" height="16">
    <properties>
     <property name="interval" type="int" value="4"/>
    </properties>
   </object>
-  <object id="28" type="electric-switch" gid="8" x="208" y="96" width="16" height="16">
-   <properties>
-    <property name="target-x" type="int" value="13"/>
-    <property name="target-y" type="int" value="8"/>
-   </properties>
-  </object>
-  <object id="30" type="gate" gid="46" x="208" y="128" width="16" height="16"/>
-  <object id="31" type="block" gid="30" x="144" y="80" width="16" height="16">
+  <object id="30" type="gate" gid="46" x="64" y="192" width="16" height="16"/>
+  <object id="31" type="block" gid="30" x="304" y="64" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="32" type="block" gid="4" x="112" y="112" width="16" height="16">
+  <object id="32" type="block" gid="4" x="64" y="0" width="16" height="16">
    <properties>
     <property name="kind" value="copper"/>
    </properties>
   </object>
-  <object id="33" type="block" gid="30" x="176" y="80" width="16" height="16">
+  <object id="33" type="block" gid="30" x="64" y="48" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="34" type="block" gid="30" x="160" y="64" width="16" height="16">
+  <object id="34" type="block" gid="30" x="112" y="80" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>
   </object>
-  <object id="35" type="block" gid="30" x="208" y="80" width="16" height="16">
+  <object id="35" type="block" gid="30" x="192" y="128" width="16" height="16">
+   <properties>
+    <property name="kind" value="crate"/>
+   </properties>
+  </object>
+  <object id="36" type="clock-emitter" gid="49" x="128" y="128" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="37" type="and-gate" gid="43" x="208" y="112" width="16" height="16">
+   <properties>
+    <property name="direction" value="right"/>
+   </properties>
+  </object>
+  <object id="38" type="and-gate" gid="43" x="80" y="112" width="16" height="16">
+   <properties>
+    <property name="direction" value="left"/>
+   </properties>
+  </object>
+  <object id="39" type="electric-switch" gid="8" x="240" y="112" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="14"/>
+    <property name="target-y" type="int" value="12"/>
+   </properties>
+  </object>
+  <object id="40" type="gate" gid="46" x="224" y="192" width="16" height="16"/>
+  <object id="42" type="clock-emitter" gid="49" x="160" y="96" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="43" type="clock-emitter" gid="49" x="160" y="128" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="44" type="floor-switch" gid="25" x="80" y="176" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="4"/>
+    <property name="target-y" type="int" value="12"/>
+   </properties>
+  </object>
+  <object id="45" type="gate" gid="46" x="32" y="64" width="16" height="16"/>
+  <object id="46" type="electric-switch" gid="8" x="16" y="48" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="2"/>
+    <property name="target-y" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="47" type="switched-emitter" gid="48" x="224" y="80" width="16" height="16">
+   <properties>
+    <property name="interval" type="int" value="4"/>
+   </properties>
+  </object>
+  <object id="48" type="floor-switch" gid="25" x="240" y="96" width="16" height="16">
+   <properties>
+    <property name="target-x" type="int" value="14"/>
+    <property name="target-y" type="int" value="5"/>
+   </properties>
+  </object>
+  <object id="49" type="block" gid="30" x="304" y="80" width="16" height="16">
    <properties>
     <property name="kind" value="crate"/>
    </properties>