Added entities

Don't merge this yet. I want to add more things.