Finishing up Comments feature addition