Trip flow

We (@timproctor ) completed the trips flow.