Completed v1.0 of TripController