Merge model redesigns to master