Rework the first two chapters