Modified Entity files

Continued barebones implementation of Entity
Added to Entity