changes from 3/17

oops...just discovered this... looks like these were changes to
attempts that we made on 3/17 that didn't get committed...if you've
made changes to the same files since then, can you just ignore these?
update/delete changes 3/20