updated
merged
vcr at least runs
now passes