New file.  debugged just enough to not crash the rest of the thing.  doesnt work yet
rename
rename
renamed
Get working with new file names
Merge remote-tracking branch 'origin/master'