real mess but tests pass
removed some junk
removed unused and formatting
more junk
undid changes