Last commit of the continuous version

Will now proceed to grid the model, to make it run faster
Also, change make_season to make_trip.