Added validation and the ability to add comments