TODO updated.  (should probably sleep now... ....)