Added additional todo notes