added some TODO comments