added support for multiple delivery options associated with a user account, rearranged routing to accomodate