Add finished ch06 and ch07