Just needs a little abstraction- and not the leaky variety