Changes to separately handle Event's vs BAEvent's