Hg 62 unit ember models

@kenkouot I think I've addressed all of your comments in the last pull request