adding some TODO notes on the code