Data collection written - needs testing and tests - have errors
Have added tests to have an event