I like the locked room, both safety and a sign that something's already happened, it's too late to escape. Sherlock is still managing the experience though, I wonder if John picks up that Sherlock is not as much in control as he thinks he is, maybe he needs the locked room as much as John does...