missing commit from last time
test3 for finding problems with the context
last bit of minor fixes to get it working