Straighten out excludes consolidation.  Still needs some considerable refactoring, but now works.