@baldur yeah there is probably a better way to refactor this so there is less dup. Will do next time I touch on-the-road.