added some TODO's for tomorrow?