Better entity management.
Merge branch 'master' of https://github.com/bradzeis/high-noon