First dump of Anders Nierhoff's code