Undo use of map, again...causes issues with multi-word filenames\n\nHad issues figuring out git rebase/reset