That's pretty cool. The *original* Castle Ravenloft. Still, the layout of the castle in I6 was cooler. I'd go with Diamond's general "map a castle" though. I've been thinking I'd like to redo the maps of Strahd's castle from Ravenloft at some point - of course, that's more than a single challenge-worth of work.
M