massive restructuring work to embed eventContexts
part-way through