Resolving Issue 2 from TODO_list