Checking in lots of crap
More model updates
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  More model updates
  Checking in lots of crap