Fixes #17 - RSVP feature