Adding ability to add comments