Completed first part of implementing comments