First commit of chapter 4