chap 2 almost complete