The mansion with many rooms.

When do we actually go to Heaven?  The reason I ask is that I was at a funeral yesterday and the pastor used the quote from Jesus about preparing a mansion for us with many rooms.  In the message the pastor made it seem like the person that had just died had already been shown to his room in the mansion by Jesus. 

Quite frankly that is what I think most of us have grown up thinking is the way it happens.  Your dead and instantly you are in Heaven with Jesus.  But what about this?

2 Timothy 4:1(NKJV)

I charge you therefore before God and the Lord Jesus Christ, who will judge the living and the dead at His appearing and His kingdom: 

And this.

1 Peter 4:5-6(NKJV)

They will give an account to Him who is ready to judge the living and the dead. 

For this reason the gospel was preached also to those who are dead, that they might be judged according to men in the flesh, but live according to God in the spirit.

If Jesus hasn't judged the dead yet, how do they get into Heaven so quickly?  Or is it that all who have died have to wait for Jesus second coming where Jesus will judge the living and dead before they actually go to Heaven? 

This one will require further study.  Not really a big deal either way as long as we get there.  Just more of my curiosity on the timing.