Add, remove, and comment stuff