Mucho refactoring

Too much for one PR, but STARTUP.