Rearchitecturing the stiched up goose part 1