Add entities

TODO: refactor to get them to work