Achieved substantial progress with comment system.