Add Repeat/Until functionality