Updated Todo's