Move to folder; figure out how to properly undo a commit; other stuff I nearly broke, I think.