start chipping away at past trips stuff per issue #36