Add more support scripts, tree munging (ongoing)