Adds comment functionality, but doesn't automatically update...wtf?
fixes conflicts