First commit - contains all work from before cvs.