Implements Assignment 4 Part 2-5

until
Merge pull request #7 from jackcviers/until

Implements Assignment 4 Part 2-5