Added Axes and Shovels and more code cleanup