Finished initial models overhaul.