Feature for comments
Hacked implementaion of comments