We're doing the same type of thing at the moment, but he doesn't come to sleep with us, he comes to wake me, he just stands at my bedroom door saying 'Have a good sleep mummy' ie. I had a good sleep and I'm done! Hahaha I'm trying to teach him to stay in his bed/room until I go get him in the morning.

This morning he came to my door, I got up immediately (didn't waste time arguing with him through the door like I have in the past), and just walked him back to his room, put him into bed, turned off the light and closed the door. He was ok with it all and stay in bed an extra 1hr and 20mins - which is when I went to wake him. He wasn't asleep for the last 10 minutes, but I have no problem with that!

Now I just have to keep getting my ass out of bed and taking him back to his room, and we should have success! for us all!