Complete the TODO list and mark as done some stuff