Topic/swagger

I think this is close merge quality. I'd appreciate some feedback.