Made some changes to the model and resulting changes to everything else.