Add code to add/remove/get comments