Events/actions added, plus a state machine (although the collections/composite classes it relies on aren't fully implimented)