Added a bunch of entity logic that was missing. I've not been updating this since I have a lot of work from university. I'll do my best