Issue #81 - more rules for matching
issue #54 - Better Site histories, forgot to change this function
Issue #54 - Better event histories!