Refactor/simplify how comments are handled
Add new comments