moves a few functions into upper class Entity