Incoming

Rework the framework to have a context.