Feature/extracontextmixin

Closes #102 

This isn't complete yet. Creating the pull request for review.