add greg's guts and Clean cruft
ignore more stuff