Added NYI statements back to original files and filter the TODO list