Allow option of extra choices. Move logic to allow processing to continue if no additional products (for extra choices)