Expand cases and first implementation of matcher