Merge in base interface types
Merge pull request #4 from dmlloyd/context

Collapse context interfaces