M.H.
We had the same issue with our son. 1. we got him the homedics lullaby projector. I got it on line at target. It has a timer it projects a scene on the ceiling and plays lullaby's. We had issues of him waking and wanting us in his room. So for about 2 weeks he would get up and come in our room and sleep on his cars couch in our room.. Win in our eyes, because he eventually would just get up and come in and lay down and not wake us. He was happy to be near us and we were happy he was not in our bed and we were not sleeping in his room. For the last 3 nights he has stayed in his bed. We have slight issue with him coming out of bed, but we threaten (have done it a few times) to close his door and then he stays in bed. My son will be 2 on Monday.
Until we got him the toddler bed ( we were waiting for his conversion kit, which turned out to be the wrong one so we just got him a cars toddler bed which he loves). We were keeping him in his crib and consequently sleeping in his room in the middle of the night to keep him in his crib.) Then when we got the toddler bed, we put the cars couch on the floor in our room and that worked out great. Now the past 3 nights he has slept all night in his room and was rewarded with lots of praise and happiness. Now, we had him transferred to the next room about two weeks ago and Wednesday was the first day he got to eat breakfast in the new room and since then he has been happy sleeping alone.