All working for new way of parsing for summary

old code still present - will be removed in next commit
Removed all old code. Commented out debug code.

Working, just a bit cleaner. I want to remove debug code but may need it
later.