Hg 62 unit ember models

Also, let's not commit code hunks that are commented out like this. I suggest doing a interactive git add to stage the hunks you want.