diff --git a/ChangeLog b/ChangeLog
index a7c9c9fbc..81f5ceb8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-12 01:50 gros
+	* wolfsburg/volcano/heimser_hut_{1,2,3}: Added the first part of the
+	  Heimser Brothers Quest.
+
 2008-01-09 00:30 kbulgrien
         * unlinked/kbulgrien/rayvins_house.1: Doors now have no gaps around
           them due to new wall_door and stwall_door arches.  Spout and
diff --git a/wolfsburg/volcano/heimser_hut_0 b/wolfsburg/volcano/heimser_hut_0
new file mode 100644
index 000000000..6cfa06672
--- /dev/null
+++ b/wolfsburg/volcano/heimser_hut_0
@@ -0,0 +1,305 @@
+arch map
+name Heimser's Hut
+difficulty 1
+region wolfsburg
+width 6
+height 7
+enter_x 2
+enter_y 1
+msg
+Created:  2008-01-12 lauwenmark
+Based on an original map of Tero Haatanen.
+Modified: 2008-01-12 lauwenmark
+endmsg
+maplore
+This map is part of the Quest of the Two Heimser Brothers.
+endmaplore
+end
+arch blocked
+end
+arch dirtfloor
+y 1
+end
+arch woodwall_2_2_2
+y 1
+end
+arch dirtfloor
+y 2
+end
+arch woodwall_2_1_1
+y 2
+end
+arch dirtfloor
+y 3
+end
+arch woodwall_2_1_1
+y 3
+end
+arch dirtfloor
+y 4
+end
+arch woodwall_2_1_1
+y 4
+end
+arch dirtfloor
+y 5
+end
+arch woodwall_2_2_1
+y 5
+end
+arch blocked
+y 6
+end
+arch dirtfloor
+x 1
+end
+arch woodwall_2_2_2
+x 1
+end
+arch dirtfloor
+x 1
+y 1
+end
+arch woodwall_2_2_4
+x 1
+y 1
+end
+arch dirtfloor
+x 1
+y 2
+end
+arch table_2
+x 1
+y 2
+end
+arch dirtfloor
+x 1
+y 3
+end
+arch table_2
+x 1
+y 3
+end
+arch dirtfloor
+x 1
+y 4
+end
+arch dirtfloor
+x 1
+y 5
+end
+arch woodwall_2_2_3
+x 1
+y 5
+end
+arch dirtfloor
+x 1
+y 6
+end
+arch woodwall_2_2_1
+x 1
+y 6
+end
+arch dirtfloor
+x 2
+end
+arch invis_exit
+slaying /world/world_129_108
+hp 4
+sp 23
+x 2
+end
+arch dirtfloor
+x 2
+y 1
+end
+arch phole_1
+slaying heimser_hut_1
+hp 2
+sp 1
+x 2
+y 1
+end
+arch mat
+x 2
+y 1
+end
+arch dirtfloor
+x 2
+y 2
+end
+arch dirtfloor
+x 2
+y 3
+end
+arch dirtfloor
+x 2
+y 4
+end
+arch c_sage
+msg
+@match clock
+A pretty nice clock, he ? It is really a rare antiquity. It was built in Euthville, during the golden age of that city. Can you imagine ? That clock is hundreds of years old !
+We found it in the ruins of the city long ago, and my brother fixed it. My brother was a genius...
+*sigh*
+@match Euthville
+It was an city located at the north of Scorn, where people could build wonderful machines one can only dream of nowadays. But their thirst for power killed them; today, only ruins remain from Euthville.
+@match brother
+My brother Keiran and I always were pretty close. When the armies of Kurthan the Bloody took Wolfsburg, I managed to escape, but my brother didn't, and was put into slavery.
+I really don't know if he's still alive or not. That clock is the only souvenir I have from the happy times of our youth...
+*sigh*
+@match *
+I'm Heinkel Heimser. What do you want from an old man like me ?
+*sigh*
+endmsg
+x 2
+y 4
+end
+arch dirtfloor
+x 2
+y 5
+end
+arch clock
+name Nice-looking clock
+msg
+You've never seen such a nicely built clock before...
+endmsg
+x 2
+y 5
+no_pick 1
+end
+arch dirtfloor
+x 2
+y 6
+end
+arch woodwall_2_1_2
+x 2
+y 6
+end
+arch dirtfloor
+x 3
+end
+arch woodwall_2_1_2
+x 3
+end
+arch dirtfloor
+x 3
+y 1
+end
+arch dirtfloor
+x 3
+y 2
+end
+arch dirtfloor
+x 3
+y 3
+end
+arch dirtfloor
+x 3
+y 4
+end
+arch dirtfloor
+x 3
+y 5
+end
+arch chair
+x 3
+y 5
+end
+arch dirtfloor
+x 3
+y 6
+end
+arch woodwall_2_1_2
+x 3
+y 6
+end
+arch dirtfloor
+x 4
+end
+arch woodwall_2_2_3
+x 4
+end
+arch dirtfloor
+x 4
+y 1
+end
+arch woodwall_2_2_1
+x 4
+y 1
+end
+arch dirtfloor
+x 4
+y 2
+end
+arch dirtfloor
+x 4
+y 3
+end
+arch dirtfloor
+x 4
+y 4
+end
+arch dirtfloor
+x 4
+y 5
+end
+arch woodwall_2_2_2
+x 4
+y 5
+end
+arch dirtfloor
+x 4
+y 6
+end
+arch woodwall_2_2_4
+x 4
+y 6
+end
+arch blocked
+x 5
+end
+arch dirtfloor
+x 5
+y 1
+end
+arch woodwall_2_2_3
+x 5
+y 1
+end
+arch dirtfloor
+x 5
+y 2
+end
+arch woodwall_2_1_1
+x 5
+y 2
+end
+arch dirtfloor
+x 5
+y 3
+end
+arch woodwall_2_1_1
+x 5
+y 3
+end
+arch dirtfloor
+x 5
+y 4
+end
+arch woodwall_2_1_1
+x 5
+y 4
+end
+arch dirtfloor
+x 5
+y 5
+end
+arch woodwall_2_2_4
+x 5
+y 5
+end
+arch blocked
+x 5
+y 6
+end
diff --git a/wolfsburg/volcano/heimser_hut_1 b/wolfsburg/volcano/heimser_hut_1
new file mode 100644
index 000000000..4216b7da0
--- /dev/null
+++ b/wolfsburg/volcano/heimser_hut_1
@@ -0,0 +1,282 @@
+arch map
+name Heimser's Cellar
+difficulty 1
+region wolfsburg
+darkness 2
+width 6
+height 7
+enter_x 2
+enter_y 1
+msg
+Created:  2008-01-12 lauwenmark
+Modified: 2008-01-12 lauwenmark
+endmsg
+maplore
+This map is part of the Quest of the Two Heimser Brothers.
+endmaplore
+end
+arch dirtfloor
+end
+arch dun8
+end
+arch dirtfloor
+y 1
+end
+arch dun11
+y 1
+end
+arch dirtfloor
+y 2
+end
+arch dun11
+y 2
+end
+arch dirtfloor
+y 3
+end
+arch dun11
+y 3
+end
+arch dirtfloor
+y 4
+end
+arch dun11
+y 4
+end
+arch dirtfloor
+y 5
+end
+arch dun11
+y 5
+end
+arch dirtfloor
+y 6
+end
+arch dun4
+y 6
+end
+arch dirtfloor
+x 1
+end
+arch dun_2_1_2
+x 1
+end
+arch dirtfloor
+x 1
+y 1
+end
+arch dirtfloor
+x 1
+y 2
+end
+arch dirtfloor
+x 1
+y 3
+end
+arch dirtfloor
+x 1
+y 4
+end
+arch loaf
+x 1
+y 4
+end
+arch dirtfloor
+x 1
+y 5
+end
+arch loaf
+x 1
+y 5
+end
+arch dirtfloor
+x 1
+y 6
+end
+arch dun_2_1_2
+x 1
+y 6
+end
+arch dirtfloor
+x 2
+end
+arch dun_2_1_2
+x 2
+end
+arch dirtfloor
+x 2
+y 1
+end
+arch ladder_up
+slaying heimser_hut_0
+hp 2
+sp 1
+x 2
+y 1
+end
+arch dirtfloor
+x 2
+y 2
+end
+arch dirtfloor
+x 2
+y 3
+end
+arch dirtfloor
+x 2
+y 4
+end
+arch dirtfloor
+x 2
+y 5
+end
+arch water
+x 2
+y 5
+end
+arch dirtfloor
+x 2
+y 6
+end
+arch dun_2_1_2
+x 2
+y 6
+end
+arch dirtfloor
+x 3
+end
+arch dun_2_1_2
+x 3
+end
+arch dirtfloor
+x 3
+y 1
+end
+arch dirtfloor
+x 3
+y 2
+end
+arch dirtfloor
+x 3
+y 3
+end
+arch dirtfloor
+x 3
+y 4
+end
+arch dirtfloor
+x 3
+y 5
+end
+arch water
+x 3
+y 5
+end
+arch dirtfloor
+x 3
+y 6
+end
+arch dun_2_1_2
+x 3
+y 6
+end
+arch dirtfloor
+x 4
+end
+arch dun_2_1_2
+x 4
+end
+arch dirtfloor
+x 4
+y 1
+end
+arch dirtfloor
+x 4
+y 2
+end
+arch dirtfloor
+x 4
+y 3
+end
+arch dirtfloor
+x 4
+y 4
+end
+arch dirtfloor
+x 4
+y 5
+end
+arch oakdoor
+name empty barrel
+slaying heimser_hut_2
+msg
+There was a ladder hidden in it, leading to a secret floor !
+endmsg
+face barrel.111
+hp 10
+sp 2
+x 4
+y 5
+end
+arch dirtfloor
+x 4
+y 6
+end
+arch dun_2_1_2
+x 4
+y 6
+end
+arch dirtfloor
+x 5
+end
+arch dun14
+x 5
+end
+arch dirtfloor
+x 5
+y 1
+end
+arch dun11
+x 5
+y 1
+end
+arch dirtfloor
+x 5
+y 2
+end
+arch dun11
+x 5
+y 2
+end
+arch dirtfloor
+x 5
+y 3
+end
+arch dun11
+x 5
+y 3
+end
+arch dirtfloor
+x 5
+y 4
+end
+arch dun11
+x 5
+y 4
+end
+arch dirtfloor
+x 5
+y 5
+end
+arch dun11
+x 5
+y 5
+end
+arch dirtfloor
+x 5
+y 6
+end
+arch dun7
+x 5
+y 6
+end
diff --git a/wolfsburg/volcano/heimser_hut_2 b/wolfsburg/volcano/heimser_hut_2
new file mode 100644
index 000000000..d20509dfb
--- /dev/null
+++ b/wolfsburg/volcano/heimser_hut_2
@@ -0,0 +1,748 @@
+arch map
+name Heimser's Lab
+difficulty 1
+region wolfsburg
+darkness 1
+width 11
+height 11
+enter_x 9
+enter_y 1
+msg
+Created:  2008-01-12 lauwenmark
+Modified: 2008-01-12 lauwenmark
+endmsg
+maplore
+This map is part of the Quest of the Two Heimser Brothers.
+endmaplore
+end
+arch dirtfloor
+y 1
+end
+arch dun8
+y 1
+end
+arch dirtfloor
+y 2
+end
+arch dun3
+y 2
+end
+arch dirtfloor
+y 3
+end
+arch dun3
+y 3
+end
+arch dirtfloor
+y 4
+end
+arch dun3
+y 4
+end
+arch dirtfloor
+y 5
+end
+arch dun3
+y 5
+end
+arch dirtfloor
+y 6
+end
+arch dun3
+y 6
+end
+arch dirtfloor
+y 7
+end
+arch dun3
+y 7
+end
+arch dirtfloor
+y 8
+end
+arch dun3
+y 8
+end
+arch dirtfloor
+y 9
+end
+arch dun3
+y 9
+end
+arch dirtfloor
+y 10
+end
+arch dun4
+y 10
+end
+arch dirtfloor
+x 1
+y 1
+end
+arch dun13
+x 1
+y 1
+end
+arch dirtfloor
+x 1
+y 2
+end
+arch bookshelf
+x 1
+y 2
+arch book_read
+msg
+...I'll require at least ten of those crystals to get enough power. Maybe we'll find some in Euthville's ruins ?
+endmsg
+value 1
+end
+arch book_read
+msg
+...How did they manage to bend the Mana Field like that ? Aequates's Second Axiom should prevent it, yet I have to admit that the Crystal does violate it...
+endmsg
+value 1
+end
+arch book_clasp
+msg
+...The cohesion is not sufficient to hold energy...
+endmsg
+value 1
+end
+end
+arch dirtfloor
+x 1
+y 3
+end
+arch dirtfloor
+x 1
+y 4
+end
+arch dirtfloor
+x 1
+y 5
+end
+arch dirtfloor
+x 1
+y 6
+end
+arch dirtfloor
+x 1
+y 7
+end
+arch power_crystal
+maxsp 3
+x 1
+y 7
+value 10
+end
+arch dirtfloor
+x 1
+y 8
+end
+arch power_crystal
+maxsp 3
+x 1
+y 8
+value 10
+end
+arch dirtfloor
+x 1
+y 9
+end
+arch power_crystal
+maxsp 1
+x 1
+y 9
+value 10
+end
+arch dirtfloor
+x 1
+y 10
+end
+arch dun13
+x 1
+y 10
+end
+arch dirtfloor
+x 2
+y 1
+end
+arch dun13
+x 2
+y 1
+end
+arch dirtfloor
+x 2
+y 2
+end
+arch bookshelf2
+x 2
+y 2
+arch book_clasp
+msg
+...Experiment 321: It still doesn't bend the Field enough. The accumulator is not pure enough. I'll try to use the one we found in the ruins.
+endmsg
+value 1
+end
+arch book_clasp
+msg
+...Experiment 453: The Crystal is too unstable. I can try to change the delta structure to 22.
+endmsg
+value 1
+end
+end
+arch dirtfloor
+x 2
+y 3
+end
+arch table_2x1
+x 2
+y 3
+end
+arch dirtfloor
+x 2
+y 4
+end
+arch dirtfloor
+x 2
+y 5
+end
+arch table_burl_3
+x 2
+y 5
+end
+arch dirtfloor
+x 2
+y 6
+end
+arch chair_wv_1.3
+x 2
+y 6
+end
+arch dirtfloor
+x 2
+y 7
+end
+arch dirtfloor
+x 2
+y 8
+end
+arch power_crystal
+maxsp 8
+x 2
+y 8
+value 10
+end
+arch dirtfloor
+x 2
+y 9
+end
+arch dirtfloor
+x 2
+y 10
+end
+arch dun13
+x 2
+y 10
+end
+arch dirtfloor
+x 3
+y 1
+end
+arch dun13
+x 3
+y 1
+end
+arch dirtfloor
+x 3
+y 2
+end
+arch dirtfloor
+x 3
+y 3
+end
+arch dirtfloor
+x 3
+y 4
+end
+arch dirtfloor
+x 3
+y 5
+end
+arch dirtfloor
+x 3
+y 6
+end
+arch dirtfloor
+x 3
+y 7
+end
+arch dirtfloor
+x 3
+y 8
+end
+arch dirtfloor
+x 3
+y 9
+end
+arch power_crystal
+maxsp 1
+x 3
+y 9
+value 10
+end
+arch dirtfloor
+x 3
+y 10
+end
+arch dun13
+x 3
+y 10
+end
+arch dirtfloor
+x 4
+y 1
+end
+arch dun13
+x 4
+y 1
+end
+arch dirtfloor
+x 4
+y 2
+end
+arch dirtfloor
+x 4
+y 3
+end
+arch table_2x1
+x 4
+y 3
+end
+arch dirtfloor
+x 4
+y 4
+end
+arch dirtfloor
+x 4
+y 5
+end
+arch blood
+x 4
+y 5
+end
+arch dirtfloor
+x 4
+y 6
+end
+arch dirtfloor
+x 4
+y 7
+end
+arch dirtfloor
+x 4
+y 8
+end
+arch dirtfloor
+x 4
+y 9
+end
+arch dirtfloor
+x 4
+y 10
+end
+arch dun13
+x 4
+y 10
+end
+arch dirtfloor
+x 5
+y 1
+end
+arch dun13
+x 5
+y 1
+end
+arch dirtfloor
+x 5
+y 2
+end
+arch dirtfloor
+x 5
+y 3
+end
+arch dirtfloor
+x 5
+y 4
+end
+arch dirtfloor
+x 5
+y 5
+end
+arch bad_cauldron
+x 5
+y 5
+end
+arch dirtfloor
+x 5
+y 6
+end
+arch dirtfloor
+x 5
+y 7
+end
+arch book_clasp
+msg
+The book contains Metamathematics used by magicians to create new spells. You've never seen such formulae before, though.
+endmsg
+x 5
+y 7
+value 1
+end
+arch dirtfloor
+x 5
+y 8
+end
+arch book_clasp
+msg
+The book contains Metamathematics used by magicians to create new spells. You've never seen such formulae before, though.
+endmsg
+x 5
+y 8
+value 1
+end
+arch dirtfloor
+x 5
+y 9
+end
+arch dirtfloor
+x 5
+y 10
+end
+arch dun13
+x 5
+y 10
+end
+arch dirtfloor
+x 6
+y 1
+end
+arch dun13
+x 6
+y 1
+end
+arch dirtfloor
+x 6
+y 2
+end
+arch dirtfloor
+x 6
+y 3
+end
+arch table_2x1
+x 6
+y 3
+end
+arch dirtfloor
+x 6
+y 4
+end
+arch dirtfloor
+x 6
+y 5
+end
+arch dirtfloor
+x 6
+y 6
+end
+arch dirtfloor
+x 6
+y 7
+end
+arch book_read
+msg
+There are children's drawings in that book. They are all signed: "Keiran".
+endmsg
+x 6
+y 7
+value 1
+end
+arch dirtfloor
+x 6
+y 8
+end
+arch book_clasp
+msg
+The book contains Metamathematics used by magicians to create new spells. You've never seen such formulae before, though.
+endmsg
+x 6
+y 8
+value 1
+end
+arch dirtfloor
+x 6
+y 9
+end
+arch dirtfloor
+x 6
+y 10
+end
+arch dun13
+x 6
+y 10
+end
+arch dirtfloor
+x 7
+y 1
+end
+arch dun13
+x 7
+y 1
+end
+arch dirtfloor
+x 7
+y 2
+end
+arch dirtfloor
+x 7
+y 3
+end
+arch dirtfloor
+x 7
+y 4
+end
+arch dirtfloor
+x 7
+y 5
+end
+arch dirtfloor
+x 7
+y 6
+end
+arch dirtfloor
+x 7
+y 7
+end
+arch dirtfloor
+x 7
+y 8
+end
+arch dirtfloor
+x 7
+y 9
+end
+arch dirtfloor
+x 7
+y 10
+end
+arch dun13
+x 7
+y 10
+end
+arch dirtfloor
+x 8
+y 1
+end
+arch dun13
+x 8
+y 1
+end
+arch dirtfloor
+x 8
+y 2
+end
+arch dirtfloor
+x 8
+y 3
+end
+arch dirtfloor
+x 8
+y 4
+end
+arch dirtfloor
+x 8
+y 5
+end
+arch dirtfloor
+x 8
+y 6
+end
+arch dirtfloor
+x 8
+y 7
+end
+arch worthlessoresmall_r
+x 8
+y 7
+end
+arch dirtfloor
+x 8
+y 8
+end
+arch worthlessoresmall_y
+x 8
+y 8
+end
+arch dirtfloor
+x 8
+y 9
+end
+arch boozebottle_empty
+x 8
+y 9
+end
+arch dirtfloor
+x 8
+y 10
+end
+arch dun13
+x 8
+y 10
+end
+arch dirtfloor
+x 9
+y 1
+end
+arch dun13
+x 9
+y 1
+end
+arch dirtfloor
+x 9
+y 2
+end
+arch ladder_up
+slaying heimser_hut_1
+hp 4
+sp 5
+x 9
+y 2
+end
+arch dirtfloor
+x 9
+y 3
+end
+arch dirtfloor
+x 9
+y 4
+end
+arch dirtfloor
+x 9
+y 5
+end
+arch dirtfloor
+x 9
+y 6
+end
+arch dirtfloor
+x 9
+y 7
+end
+arch worthlessoresmall_y
+x 9
+y 7
+end
+arch dirtfloor
+x 9
+y 8
+end
+arch wbottle_empty
+x 9
+y 8
+end
+arch dirtfloor
+x 9
+y 9
+end
+arch boozebottle_empty
+x 9
+y 9
+end
+arch dirtfloor
+x 9
+y 10
+end
+arch dun13
+x 9
+y 10
+end
+arch dirtfloor
+x 10
+y 1
+end
+arch dun14
+x 10
+y 1
+end
+arch dirtfloor
+x 10
+y 2
+end
+arch dun3
+x 10
+y 2
+end
+arch dirtfloor
+x 10
+y 3
+end
+arch dun3
+x 10
+y 3
+end
+arch dirtfloor
+x 10
+y 4
+end
+arch dun3
+x 10
+y 4
+end
+arch dirtfloor
+x 10
+y 5
+end
+arch dun3
+x 10
+y 5
+end
+arch dirtfloor
+x 10
+y 6
+end
+arch dun3
+x 10
+y 6
+end
+arch dirtfloor
+x 10
+y 7
+end
+arch dun3
+x 10
+y 7
+end
+arch dirtfloor
+x 10
+y 8
+end
+arch dun3
+x 10
+y 8
+end
+arch dirtfloor
+x 10
+y 9
+end
+arch dun3
+x 10
+y 9
+end
+arch dirtfloor
+x 10
+y 10
+end
+arch dun12
+x 10
+y 10
+end
diff --git a/world/world_129_108 b/world/world_129_108
index 0497af8d3..0873b0c03 100644
--- a/world/world_129_108
+++ b/world/world_129_108
@@ -4,7 +4,7 @@ region wolfsburg
 width 50
 height 50
 msg
-Modified: 2007-12-24 tchize
+Modified: 2008-01-12 lauwenmark
 endmsg
 outdoor 1
 tile_path_1 world_129_107
@@ -1118,8 +1118,8 @@ x 4
 y 23
 end
 arch hut
-slaying /wolfsburg/volcano/vvhuts
-hp 3
+slaying ../wolfsburg/volcano/heimser_hut_0
+hp 2
 sp 1
 x 4
 y 23