Temp
WIP further refactoring, pulled out matcher
Something something wip
WIP (pulled out seven day time span validator)