Pushing for changes

Not much done, I forget what infact. But I'm bringing the code into
you-know-where, so I'll be doing it a good bit I hope.