The start of some major model refactors.