Api dev merge to master

Adds Swig UI and an almost complete annotations API