Updated todo based on last commit