commit tues 530
wednesday morning, merging
trying to merge again