Start to Entity movement

Added some stuff to start using entities more