Fixed Plumber rework. Almost ready to test with circular reactive setup.