How to express time - Until

Kia ora ra! I really struggled to explain some concepts today, but hopefully you still get the gist of what I am trying to explain.We look at the below phrases, taken from Ray Harlow's A Maori Reference grammar [pg.265]:Me noho ki konei kia hoki rawa mai au - Stay here until I get back.I noho mai ratou, tae noa mai ki te Rahoroi kua hipa nei - They stayed right up till last Saturday.Me u tonu ki te mahi tae noa atu ki te wa e oti ai - You should stick to the task right up till the time it is completed.Ae, i tae pai au ki Waitetoko, a, mai i taua wa e noho nei au i taku kainga - Yes, I arrived safely at Waitetoko, and since that time I have been living in my home.