Updates, refactoring.  Working on getting rid of swagger code gen