Comments functionality complete