Update API and add tasks to TODO.