Adding entities.
Merge pull request #7 from gmaslowski/entities

Adding entities.