Trips restructured, new model one_day added
Merge