Last continuation based modifications.

These will probably be the least additions for a little while.