Even more updates

I'm making great progress, but there is still a long way to go before
it's functional.