added summary view, working on history
actually added summary
fixed merge conflict