Progress moving to "re" module