Added very basic comment functionality #1