Got comments working after I broke it several commits ago