Over time I have come to the conclusion that between the first book where the plan "trap Voldemort for the next twenty years in the basement" failed and the second book where Dumbledore realized that the Horcruxes were in play and that was what the Prophecy was about, there was another plan. I...