Unified calculus, move future work (Chapter 6)