More work towards comments