Added some model stuff
Finished light skeleton for models
minor changes
Merge branch 'master' into front_end_js
minor changes