more work on rsvp data layer