added list of trips, renamed controller, added global controller