Added a moveEntity method, cleans up the system quite a bit