More steps towards comments