Added some TODO comments