Added final todos