Merge model updates

This thing is huge. Lets try to merge it asap