First commit of tool-in-progress