Finish model so far and update controller to match. Thought this got pushed yesterday...