Updated Todo and stuff to be done