Extended TODO (made up to date)