I was really unsure about going back and forth to change tools. Good thing I removed the part where you also had to carry the treasures, haha
On the other hand, some people seemed to like the fact that they werent 100% sure of their measurements until they went back with a shovel. Maybe there's a balance between the two that I can work out.