Refactored out comment template - TODO: need to convert to a template tag