taking out debug messages.  updated todo