Doco and cleanup, part one. WILL NOT COMPILE!