Rob changes, chapter 1 almost done
Merged in jims changes, chapter1 almost done