remove/add new comment system
finish with new comments