Had some lines commented-out for speed in development. I should not have checked them in commented-out.