Commit chapters 2 and 3