Complete.

Yep, it works. Next tests and cleanup.