Added a number of TODOs