Prop tool stuff

As suggested in http://tpt.io/.257317