WIP move to add-on sdk