more swagger work, getting to something that's not a complete mess