added some todos;