Started working on TBA::Event; more cleanup