Context work

completes the facility work for #131