added some TODO 's