Nearly final version! All formulas besides trip added