Fix the way we were generating event maps
Start adding proper event parses