Box out the context

Fixes #50