Added take-until.

Note that this does not look at all like what the bacon guys did.  What they did seems over complicated, but I'lm sure I'll figure out why in the very near future.