HashMap replaced with DiscoveredEvent class
Lots of refactoring to tidy things up