Key things with entities.
Merge pull request #2 from jordandukart/7.x

Key things with entities.