RE-IMPLEMENTED Unit movement