adding some TODO comments