First version of the new tools code