More model.js work.

At this point, the remaining TODO notes found in model.js SHOULD
indicate what still needs to be done for the file.

Emphasis on "should".