In the middle of adding comment capabilities