Add TODO list, add test for bird