Adding entities

Coming soon!