More WIP, done with controllers

Almost done with models, still many views.  16 (stage 1) errors.