Partial implementation of comments