Work on RSVP and styling
conflict resolution