Refactoring

Overhaul of pretty much everything.