More work on moving-man. Committing because I need to make sure I can get the testing scripts to work.