Number of shuttle missions to ISS left?

[radarredux]

I have lost track of the number of shuttle flights planned for assembly of ISS. I seem to recall there were 2 more "test flights" which do not involve assembly, and 1 potential flight for Hubble - for a total of 3 non-assembly shuttle flights.<br /><br />Today's Spaceflight.com said the NASA budget lays out 17 flights, so does that mean there will be only 14 non-test flights to the ISS?<br /><br />Is there a schedule of payloads posted reflecting this number of flights?

 

[ehs40]

http://forum.nasaspaceflight.com/forums/thread-view.asp?tid=1342&start=111<br /><br />this shows that by the end of 2007 iss u.s. core complete+ esa's cloumbus