added some TODO's