Finished (at least initially) fleshing out the item model and started moving the controller to a similar structure