Changes added for comments, but still not close to working