Yes yes yes! And the either/or aspect of it really reminded me of Gaudy Night by Dorothy L. Sayers. You have no idea how badly I want to push that book on you and Renay, but I feel bad that in addition to being 600 pages long, you have to read two other books before it for it to make sense :P
no subject