New todo's and changes