Added todo list to track what needs to be done for the current feature