Refactor of adding tasks to lists, lists to tasks, but not quite done