got to line 951 in commenting and cleaning up