Work towards making adding Events to work