testing branch
a few updates to TODO and README