initial refactor trip plann stuff...