So much refactoring

Wow. Such refactoring. Much change.