Continued work on contexts.
Continued work on contexts.
Works reasonably well, still problems with context switching
Working?!
Fixes all tests
merge, fix tests