Add big part of 4th chapter (1-7)