diff --git a/CHANGES b/CHANGES
index 9417a5192..74b422a68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,23 +1,80 @@
 Changes for SVN top of tree:
 
+Add dev/wip directory for commiting work-in-progress archetypes.  The directory
+is not visible in Gridarta CrossfireEditor, but can be made so with a soft link
+like arch/trunk/wip --> arch/trunk/dev/wip.
+Add dev/wip/README describing the use of the directory.
+Add dev/wip/manhole as a manhole archetype work-in-progress to facilitate some
+collaboration on getting a multi-tile HOLE animation to work.  Included is a
+README and a world_105_115.patch test case.
+Kevin Bulgrien 2007-12-29
+
+Add names to woodfloor, woodfloor2, woodlarge, and dirtfloor.
+Nicolas Weeger 2007-12-29
+
+Nicer mountain1, 2, 3, 4 5.
+Update woods_4 archetype so it's not anymore acting as a ground (transparency
+parts, it is *NOT* a ground, visually speaking)
+Make the fireball and firebreath smooth
+Tchize 2007-12-28
+
 Add smooth image for light snow + source file + empty layer file (use it to help building smooth images)
 Tchize 2007-12-24
 
 Add the archetype hook for user-defined plugin events.
 Yann (gros) Chachkoff 2007-12-23
 
+Add various lighthouse archetypes to replace use of huts and towers that are
+called "lighthouse" in various maps.  A base archetype is added along with
+west, northwest, and snowy variants.
+Kevin Bulgrien 2007-12-22
+
+Singing anim_suffix.
+Nicolas Weeger 2007-12-21
+
+Singing animation for Fenx.
+Nicolas Weeger 2007-12-18
+
+Add missing faces for spider (for now, always the same sprite).
+Nicolas Weeger 2007-12-16
+
+Add ne, se, sw, and nw corners to the mine walls to fix the Scorn port gate
+house with consistent walls.
+Kevin Bulgrien 2007-12-10
+
+Four facings for angel, and sword animation.
+Facings for whim.
+Nicolas Weeger 2007-12-09
+
+Basic animation for Ruggilli's altar.
+Basic animation for Sorig's altar.
+Nicolas Weeger 2007-12-07
+
+Commit spellcasting animations for chinese dragons
+Andreas Kirchbaum 2007-11-30
+
+Added a spellcasting animation for the Big Dragon. Courtesy of Rednaxela.
+Yann (gros) Chachkoff 2007-11-29
+
 Add anim_suffix spellcasting to all spells.
 Alex Schultz 2007-11-29
 
 Add correct plural name to flowers_permanent.
 Andreas Kirschbaum 2007-11-23
 
+Add sample support for spellcasting compound animations.
+Try to cast minor healing with a Fenx 
+Yann (gros) Chachkoff 2007-11-18
+
 Update spellcasting objects to use inventory objects.
 Andreas Kirschbaum 2007-11-04
 
 Rename low_boots from "shoes" to "pair of shoes".
 Andreas Kirschbaum 2007-11-03
 
+New archetypes goldflagstone.arc  to avoid using creator tricks.
+Nicholas Weeger 2007-10-20
+
 Revert previous change of dragon's steaks weight.
 Andreas Kirschbaum 2007-10-15
 
diff --git a/dev/wip/README b/dev/wip/README
new file mode 100644
index 000000000..d3e14b2ef
--- /dev/null
+++ b/dev/wip/README
@@ -0,0 +1,27 @@
+==============================================================================
+arch/dev/wip
+==============================================================================
+
+This directory is a holding area for archetypes that are under development or
+are good ideas, but have frozen mid-development for some reason.  That said,
+this is not a holding area for large volumes of aborted works.  The primary
+use should be to retain works-in-progress for collaborative use and/or to
+pass an incomplete work on to another (future?) developer.
+
+It is suggested that each work-in-progress is created in a sub-directory and
+that this directory (dev/wip) be used primarily for persistent files.
+
+The archetypes under this directory are invisible to Gridarta CrossfireEditor
+by default.  The following is an example of how to easily make these files
+accessible in the map editor.
+
+If an archetype in this directory is put into service, remove any unneeded
+files and and place the archetype in a directory outside this arch/dev area.
+
+In cases where an archetype is under test, it may be advantageous to provide a
+patch that may be used to hook the arch into a map so that other developers
+are able to reproduce results.
+
+  $ cd /path/to/sandbox/arch/trunk
+  $ ln -s dev/wip wip
+
diff --git a/dev/wip/manhole/README b/dev/wip/manhole/README
new file mode 100644
index 000000000..d1f5ed154
--- /dev/null
+++ b/dev/wip/manhole/README
@@ -0,0 +1,46 @@
+To access this archetype in Gridarta CrossfireEditor, be sure to link the wip
+directory with a command like this:
+
+  $ cd /path/to/svn/checkout/arch/trunk
+  $ ln -s dev/wip wip
+  $ cd /path/to/svn/checkout/server/lib
+  $ make collect
+
+manhole.arc
+
+  manhole_closed_1
+
+    A HOLE modeled after arch/trunk/connect/Hole/pit.arc pit_closed, except
+    that it is a multi-tile archetype, and that the non-head pieces are
+    deliberately set to the wrong face so that the animation works.
+
+  manhole_open_1
+
+    A HOLE modeled after arch/trunk/connect/Hole/pit.arc pit_open that shows
+    the animation is broken when the archetype is probably set up "correctly".
+
+world_105_115.patch
+
+    Test of pit_open, pit_closed, manhole_closed_1, and manhole_open_1. To
+    apply the patch, and presuming that the maps and arch SVN checkouts are
+    in the same directory, use the following command.
+
+    $ patch -p0 world_105_115.patch
+
+manhole.base.xcf
+
+    This is a GIMP 64 x 64 bit image with layers and transparency.
+
+    The elements used to construct the manhole .png files.  This file does also
+    contain some variations of the archetype that could be used to produce
+    different manholes (rust- colored vs. bronze, for example).
+
+manhole.base.111.png
+manhole.base.112.png
+manhole.base.113.png
+manhole.base.114.png
+
+    A bronze manhole animation set.  111 is an open manhole. 112 and 113 are
+    transitional shots of a manhole opening or closing, and 114 is the closed
+    manhole.
+
diff --git a/dev/wip/manhole/manhole.arc b/dev/wip/manhole/manhole.arc
new file mode 100644
index 000000000..b46fdd8fa
--- /dev/null
+++ b/dev/wip/manhole/manhole.arc
@@ -0,0 +1,83 @@
+# These archetypes are presently modeled after the contents found in pit.arc in
+# the arch/trunk/connect/Hole directory.  The difference is that this archetype
+# is a 64 x 64 bit multi-tile HOLE.
+#
+# This animation works, but the x1, y1, x1 y1 pieces have the wrong face, so
+# the player view of the closed manhole is messed up.  Not only that, but the
+# animation takes place at x-1, y-1 instead of at x,y.
+#
+Object manhole_closed_1
+name manhole
+type 94
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+face manhole.114
+anim
+manhole.111
+manhole.112
+manhole.113
+manhole.114
+mina
+is_animated 0
+wc 4
+maxsp 0
+visibility 50
+magicmap black
+end
+More
+Object manhole_closed_1a
+face manhole.111
+x 1
+end
+More
+Object manhole_closed_1b
+face manhole.111
+y 1
+end
+More
+Object manhole_closed_1c
+face manhole.111
+x 1
+y 1
+end
+#
+# This animation does not work, but is a copy of arch/connect/Hole/pit.arc so
+# should work the same as that pit.
+#
+Object manhole_open_1
+name manhole
+type 94
+activate_on_push 1
+activate_on_release 1
+no_pick 1
+face manhole.111
+anim
+manhole.111
+manhole.112
+manhole.113
+manhole.114
+mina
+is_animated 0
+move_on walk
+wc 0
+maxsp 1
+visibility 50
+magicmap black
+end
+More
+Object manhole_open_1a
+face manhole.111
+x 1
+end
+More
+Object manhole_open_1b
+face manhole.111
+y 1
+end
+More
+Object manhole_open_1c
+face manhole.111
+x 1
+y 1
+end
diff --git a/dev/wip/manhole/manhole.base.111.png b/dev/wip/manhole/manhole.base.111.png
new file mode 100644
index 000000000..533b434ef
Binary files /dev/null and b/dev/wip/manhole/manhole.base.111.png differ
diff --git a/dev/wip/manhole/manhole.base.112.png b/dev/wip/manhole/manhole.base.112.png
new file mode 100644
index 000000000..29f284a23
Binary files /dev/null and b/dev/wip/manhole/manhole.base.112.png differ
diff --git a/dev/wip/manhole/manhole.base.113.png b/dev/wip/manhole/manhole.base.113.png
new file mode 100644
index 000000000..62ebdaadf
Binary files /dev/null and b/dev/wip/manhole/manhole.base.113.png differ
diff --git a/dev/wip/manhole/manhole.base.114.png b/dev/wip/manhole/manhole.base.114.png
new file mode 100644
index 000000000..27c8b7c73
Binary files /dev/null and b/dev/wip/manhole/manhole.base.114.png differ
diff --git a/dev/wip/manhole/manhole.base.xcf b/dev/wip/manhole/manhole.base.xcf
new file mode 100644
index 000000000..e10d858ca
Binary files /dev/null and b/dev/wip/manhole/manhole.base.xcf differ
diff --git a/dev/wip/manhole/world_105_115.patch b/dev/wip/manhole/world_105_115.patch
new file mode 100644
index 000000000..bacdb96a1
--- /dev/null
+++ b/dev/wip/manhole/world_105_115.patch
@@ -0,0 +1,208 @@
+Index: ../../../../../maps/trunk/world/world_105_115
+===================================================================
+--- ../../../../../maps/trunk/world/world_105_115	(revision 8060)
++++ ../../../../../maps/trunk/world/world_105_115	(working copy)
+@@ -9,7 +9,11 @@
+ enter_y 1
+ msg
+ Created:  2001-02-16
++<<<<<<< .mine
++Modified: 2007-12-29 Kevin Bulgrien
++=======
+ Modified: 2007-12-24 tchize
++>>>>>>> .r8038
+ endmsg
+ outdoor 1
+ tile_path_1 world_105_114
+@@ -1569,8 +1573,16 @@
+ arch cobblestones2
+ x 3
+ y 34
+-elevation 7225
++elevation 10685
+ end
++arch button_lever
++msg
++Pit Test #1
++endmsg
++x 3
++y 34
++connected 64
++end
+ arch dungeon_magic
+ x 3
+ y 35
+@@ -1580,6 +1592,14 @@
+ y 35
+ elevation 10034
+ end
++arch button_handle
++msg
++Manhole Test #1
++endmsg
++x 3
++y 35
++connected 63
++end
+ arch dungeon_magic
+ x 3
+ y 36
+@@ -1596,7 +1616,7 @@
+ arch cobblestones2
+ x 3
+ y 37
+-elevation 12068
++elevation 8727
+ end
+ arch dungeon_magic
+ x 3
+@@ -1605,7 +1625,7 @@
+ arch cobblestones2
+ x 3
+ y 38
+-elevation 12236
++elevation 8727
+ end
+ arch dungeon_magic
+ x 3
+@@ -2029,8 +2049,15 @@
+ arch cobblestones
+ x 4
+ y 34
+-elevation 6917
++elevation 6692
+ end
++arch pit_closed
++hp 6
++sp 39
++x 4
++y 34
++connected 64
++end
+ arch dungeon_magic
+ x 4
+ y 35
+@@ -2056,8 +2083,15 @@
+ arch cobblestones2
+ x 4
+ y 37
+-elevation 10853
++elevation 12236
+ end
++arch manhole_closed_1
++hp 6
++sp 39
++x 4
++y 37
++connected 63
++end
+ arch dungeon_magic
+ x 4
+ y 38
+@@ -2074,7 +2108,7 @@
+ arch cobblestones2
+ x 4
+ y 39
+-elevation 10685
++elevation 8727
+ end
+ arch dungeon_magic
+ x 4
+@@ -2454,7 +2488,7 @@
+ arch cobblestones
+ x 5
+ y 34
+-elevation 6692
++elevation 5919
+ end
+ arch dungeon_magic
+ x 5
+@@ -2498,10 +2532,10 @@
+ x 5
+ y 37
+ end
+-arch cobblestones
++arch cobblestones2
+ x 5
+ y 37
+-elevation 9652
++elevation 7364
+ end
+ arch dungeon_magic
+ x 5
+@@ -2519,7 +2553,7 @@
+ arch cobblestones2
+ x 5
+ y 39
+-elevation 9827
++elevation 8727
+ end
+ arch dungeon_magic
+ x 5
+@@ -2912,8 +2946,15 @@
+ arch cobblestones
+ x 6
+ y 34
+-elevation 5919
++elevation 6692
+ end
++arch pit_open
++hp 6
++sp 39
++x 6
++y 34
++connected 65
++end
+ arch dungeon_magic
+ x 6
+ y 35
+@@ -2941,6 +2982,13 @@
+ y 37
+ elevation 7865
+ end
++arch manhole_open_1
++hp 6
++sp 39
++x 6
++y 37
++connected 66
++end
+ arch dungeon_magic
+ x 6
+ y 38
+@@ -3350,8 +3398,16 @@
+ arch cobblestones2
+ x 7
+ y 34
+-elevation 4624
++elevation 10685
+ end
++arch button_lever
++msg
++Pit Test #2
++endmsg
++x 7
++y 34
++connected 65
++end
+ arch dungeon_magic
+ x 7
+ y 35
+@@ -3359,8 +3415,16 @@
+ arch cobblestones2
+ x 7
+ y 35
+-elevation 3552
++elevation 10034
+ end
++arch button_handle
++msg
++Manhole Test #2
++endmsg
++x 7
++y 35
++connected 66
++end
+ arch dungeon_magic
+ x 7
+ y 36