Can we just make those local functions ? I'm not sure we really want to expose those to the outside world.