made various new models and controllers
made more stuff
json stuff