Death is Gain: When Do Christians Go to Heaven?

When do Christians go to heaven? Upon death or at the general resurrection from the dead? What about our bodies? How does this all work? How can I grow in confidence as I approach death that I will be with the Lord?