Working on tool refactor