clean up the structure a bunch, get roster data from event listener [#1]