Consolidated Entity class, testing some things out

There are some memory leaks sometimes and I'm not 100% sure why, but I'm
syncing now for progress' sake.