Ugh I got the ordering wrong.  Man I gott start working with topic branches so I can squash commits more easily