I've started work on the OOC. Should be done in a day or so.