First commit by wiikii for chapter 1