Refactor globber

Not exactly what I think it should, but a lot closer.