Preliminary work on comments