wip: more context stuff