Some more refactoring. Slowing moving towards a somewhat coherent design.
Mo' stuff.