Advances in match in this branch.

Flow control entirely from match