Unified matchers, made available in gem
Knitting together final structure
Cleaning up gem deps