Recursive Rewrites
Cleaned up the procs a bit and added safety checks
Merge pull request #2944 from ChuckTheSheep/Recursive-Recursive-Recursive-Recursive

Recursive Rewrites