more work on TODO