Still needs work on the events and external data collection