Nearly done for cocoa support