Calculate trip time


We resolved the conflicts and now have distance-time and some stuff about power source.