Initial checkin during chapter 5.