Changes from Ian

Changes made by Ian adding Category and Type fields to events.