Added a number of TODO comments