Add multi-machine logic & fix broken bootstrap using water.steps()