Adding todos, and copied over latest version <TC>