Context work

work towards #131