Added some TODOs to improve the code.