V11 match copy syntax

Large refactoring