ToDo now sorts (think it's finally finished!)