[WIP] Introduce the new context