add TODO
more twiddling