renaming and some more reporting

time to make this legit and start over with tests