moved a bunch of stuff around and working version of Tool two!