GitHub #152: (wip) refactor to support naming of contexts