Done for the night.

Need to rethink some of this, will do some more later.