Toddler who doesn't sleep and due in October!

I have a 1 year old who still wakes up several times during the night. Sometime around 6 or 7 times. He does sleep in our room, just not with us. I will be transitioning him to his own room once we get a bed set up... But I'm a nervous wreck thinking he is going to turn into some sort of ninja and try to get out of his crib. I just know I need to get him sleeping better and out of our room before the new baby comes.