added todos in code