Allow saving of comments
Handle names differently - take off everything after comma