[Fixes#67658830] Uses a datetime object for the trip time instead of time.  Using Time only does not let us properly account for daylight savings time.
[Fixes#67658830] Uses a datetime object for the trip time instead of time.  Using Time only does not let us properly account for daylight savings time.
[Fixes#67658830] Resolving merge conflicts.
[Fixes#67658830] Uses a datetime object for the trip time instead of time.  Using Time only does not let us properly account for daylight savings time.
[Fixes#67658830] Resolving merge conflicts.