Added people and toilet and added in the event aggregator/messaging crap and simple util classes.