Continued fleshing out my model and view