WIP - sdk refactor