So DS and I took the rail off, and put a rolled up towel under the sheet at the edge like you suggested Olive.

DS was so cute, the first thnig he did was climb up and get teddy and his pillow and he walked them around the whole house, as if to say "see teddy this is what I've been telling you about".

I'm a bit nervous that when I put him into bed tonight he will just get up and play in his room. Any suggestions? I was thinking maybe I should take some of the toys out till he's used to it??