continued work on ch2
completed ch2
merge