And the winner is......

Jefrilyn!!! Johnny has slept through the night the last 4 or 5 nights now, and has slept about 11 hours at night. His naps are now about 2 1/2 hours long. Thank you Jefrilyn for suggesting passionfruit juice, we doubled how much we gave him the first night, and have a new system with it. We also ran to the store and picked up a cd player and a lullaby cd that has music and rainforest sounds in the background; we leave it on repeat all night and he seems to like that. Instead of cracking his door we are completely closing it, then he know we can't see into his room from ours and hasn't been calling our names in the middle of the night. It's been so much better, we've got a lot done in the evenings (we've also been putting him to bed an hour and a half earlier), and we don't feel so sleep deprived in the morning. I'm hoping this system we've got works for a long time!!!