diff --git a/todo/nping.txt b/todo/nping.txt
index 75c09e452..9eacab5f6 100644
--- a/todo/nping.txt
+++ b/todo/nping.txt
@@ -59,36 +59,46 @@
     tcp dst port 9929 (or --echo-port N, if that is set), because 1) the
     echo server does not capture those packets and 2) to avoid messing up the
     established side-channel tcp connection.
-    
-* [EM] Implement crypto
-
-* [EM] Try to delay output for RCVD packets. Let's see how difficult this gets.
-
-* [EM] Add received echoed packet to the final statistics.
-
-* [EM] Get rid of some messages that are currently displayed in the client.
-  Print them only if debugging level is high enough.
 
 * [EM] Improve client error handling. Currently it doesn't behave well when
   the server crashes.
 
+* [EM] Make the client timeout if the server does not send data during
+  handshake. Currently the client waits forever.
+
+* [EM] Do more testing.
+
 * [EM] Make the server detect when a client disconnects and delete its context
   data.
 
+* [EM] Get rid of some messages that are currently displayed in the client.
+  Print them only if debugging level is high enough.
+
+* [EM] Make sure -h help screen includes info about the echo mode.
+
+* Do more testing on MS Windows.
+
+* Fix Windows rtt values.  Right now Nsock does not seem to be giving
+  the callback at the proper time, or something.
+    
+* [EM] Implement crypto
+
+* [EM] Add precision timestamp in NEP_ECHO noting when server received
+  the packet.
+
+* Do more testing on Mac
+
+* [EM] Add received echoed packet to the final statistics.
+
 * [EM] For CAPT packets, decide if we want to print the full info or just
   the fields that have changed in transit.
 
-* [EM] Make the client timeout if the server does not send data during
-  handshake. Currently the client waits forever.
-
-* [EM] Make sure -h and the man page have info about the echo mode.
-
-* Fix Windows rtt values.  Right now Nsock does not seem to be giving
-  the callback at the proper time, or something.
-
 * Stats for ARP packets.
 
-* Do more testing on Mac OS & MS Windows.
+* Add echo mode to the man page
+
+* [EM] Do some extensive testing of the Echo mode once it is working
+  to try and flesh out any bugs before merging.
 
 * Make privileged and unprivileged TCP/UDP mode specification consistent.
 
@@ -108,6 +118,27 @@
 * Test out Nping IPv6 on working IPv6 network (even if just between
   two machines, or localhost, or with a VMWare guest).
 
+* [EM] Consider whether the CAPT line should (or should have an
+  option to) display the time based on capture time from the server.
+  Obviously this can be problematic because not all machines run
+  ntpd.  One option is to just make it an option so that people should
+  only use it if both the client and server are running ntpd.  Luis is
+  adding a precision timestamp to NEP_ECHO packets so we could easily
+  add it in the future.  Another approach would be to do NTP-style
+  handshaking to compute time offsets between the two machines during
+  the echo side-channel handshaking.  Then the client could remember
+  how far off it is.  A third approach is to guess about the CAPT time
+  that it was 1/2 the time between packet send and when we received
+  the NEP_ECHO back notifying us of receipt.
+
+o [EM] Consider whether we should delay RCVD packet printing
+  slightly so that CAPT packets received just slightly afterward could
+  be printed before the RCVD.  This might make the most sense if we do
+  the previous feature where we show the time that a packet was
+  actually captured by echo server.  If we did it in normal cases, it
+  might make it easier to compare SENT and CAPT packets, but would
+  also be a bit strange to see the timeline out-of-order.
+
 * Decide more on rDNS
  - Do we want to rDNS resolve all target IPs?  If so, where should we
    show the name?  At the final report (even when just one host