Feature/continue implementing api

[rfalanga]

I've done a lot of work in this branch and don't want to lose it, so I'm merging it back into main