Commenting some todos.