More major refactoring, though this phase is starting to come together.