converted most of Harness to generators