small commit before I start messing around with join/leave again