Messy WIP. Once again reworking Matchers, adding initial work for History.