working on commenting functionality, almost done.