Prep for 2.5
Initial work on RSVP system