Add a join event and some test stuff