Mostly refactored trip separation to activerecord models