Unit movement has been added and works with the other functions