Add comment
Implemented controller and error-checking model logic
Add new test and fix up others
Outline of model merging code, including validation