Urgh. stuck in an architecture that's getting too complex? re #32