Add Event types

Close #39. Close #38. Close #36. Close #35. Add event types. Update events to work with event types. Add tests for event types. Update event tests.