starting a restructuring of this whole deal
well as it turns out this was easier to fix than I thought