* Added todo notes