BabySteps: support for repetitions and wait.