Contain Matchers Refactoring.

Work in progress new contain matchers refactoring.