Reworking tool to be a little more useful.