chap 3 revision wip
work in progress chap 3
merge solved chap 3 revision wip