added some TODO#s