move to use RSVP promises