Better Diagnostic function

Outputs statistics stratified by validation set source

Gives validation map for each state
validation final
Combined steps matching

Incremental match with different strategies