WIP working on API and modifying the sample at the same time