Added ETA functionality, and reorganized destination code.