The big question will be if I rip out all the AppKit code after WWDC and go to a single Marizpan codebase. Gotta wait till June though for that decision. ;)