Works reasonably well, still problems with context switching
Working?!
Fixes all tests