added chapter two info
merged from branch and such