move to Tools
v3 working, I think