Add event ranks. Comment out faiing tests to fix later