Added EntityManager for future use.
Changed code to implement EntityManager as intended for now :D