WIP on SDK and API