First step of using refactored process regex

I think everything is working but I now need to debug. check in before I
proceed.
pree refactor mostly done

I need to once over it a little more but it looks about finished. Should
be ok though.