Almost done.

There's still some testing to be done.