Base trip models from old app plus a few changes