minor changes to structure. events are properly mapped over as well now.