Connected the two summary classes.  commiting to find a bug I just introduced using github's nice diff features.
Added finishing touches and some bug fixes
removed one line of whitespace
factored out redundant code.
I am a good coder.
fixed conflict with Bruce's branch
Solved merge conflict with Ji's branch
Merge pull request #126 from coldstar96/combine-summary

Combine summary