DRAFT 6/5/97 WARRANT AGREEMENT