Add some TODO comments