Added even more 1.9 ToDos