Added some code to help with general moving