Added more todo based on doing some real projects