Match flow

Added match flow (views & logic)