First version for chapter 1 and 2 finished