More restructuring, trying to load the events on the client side now too