add some TODO comments in the code