Done. Uncovered a few bugs in the process.