`Tool developer

update to try and pull all of the stuff for our branch out of GUI