First working implementation of commenting