Added join/waitlist functionality