Bring chapter 2 and 3 into parity with cloud providers