Agreed, this needs a proper re-think, with some design involvement. Leaving it for now.