Got rid of everything (comments!) because I need to incrementally rewrite.