start refactoring out common spiro models