halfway thru 3.6, refactoring eventData.js and eventController