Mike commit

-merged New Strategy

-implement new matching with New Strategy

-Only Evaluator left