Move DepartureTime into it's own class