Making progress on Comments implementation, adding disease type