WIP Separate out all the swagger-ui