Getting there

Well, the code compiles again. There are a few bugs to chase down still.