First commit of client tools