Finished implementing comments