Some tweaks. Slowly building the data models and mocking event data to make this possible.