I think you got the idea exactly right! Clue, translated to a classic dungeon, that's a cool idea.