Major refactors.