Part 1 of rewriting to use the tool wrapper.
p2 of CRAFTCONO-62
It compiles! Does it work? Probably not!
Finished CRAFTCONO-62 Still highly experimental. Backup before using it!
Merge branch 'rewritetools'

* rewritetools:
  Finished CRAFTCONO-62 Still highly experimental. Backup before using it!
  It compiles! Does it work? Probably not!
  p2 of CRAFTCONO-62
  Part 1 of rewriting to use the tool wrapper.