WIP adding Swagger API
Rebase from master