Entity stuff

the .gitignore doesn't seem to be working, going to take a look at it