Moved All Movement Handling to Inside the Entites