Initial working RSVP version