A Tiger Swallowtail?

I think we may a couple Swallowtails here.  The false eyes are a giveaway.  Caterpillars do change color as they go from the egg to cocoon.  I found some very similar ones for a Canadian Swallowtail.  Only problem is that the butterfly does not get down this far south and I have two of them.  So I asked the friendly folks at the Austin Butterfly Forum and they told me that it looked like the caterpillar for the Tiger Swallowtail.

A quick search confirmed it.