Add the stop time, and not the start on the emails.
Get the correct location based on the new system.

Fall back to the old if needed…