Hg 62 unit ember models

This file has been changed pretty drastically in master. I suggest reverting the changes to this file completely and then merging from master.