More Open Kit Integration work