first pass at big changes to agreements