Making progress on Comments implementation