Even more restructuring

Pushing non-working code is always a good idea! Wheee!