Implemented ExtensionMatch, light testing done