Got basic cancellation working
Removed Solver events