Flesh this out sufficiently to be a functional tap