Added Todo's where I recieve errors.