Build #54:   Add TODOs on branch feature/core about 7 years ago