Sort of working. Broke the refactored comments partial