Commit missing classes from preemption branch.