Final refactoring, added multi-criteria example
Added Struct commented out