Enable delay/rendering during generation

Including a switch to enable/disable