More major refactors.