Before re-dirtying names

Code working.  About to try using Name() to deal with ugly column names
rather than cleaning them.