Added Until() and Trigger()

Until() still is not fully functional