More Event Work, finally getting somewhere I think...