Continued working on Entity movement