Refactor a lot of the tools
refactor sword and shovel