Adding first draft of ToolFinder changes