Finished up the initial implementation of the Entity event, merging in the FSM to this type.