It's actually called Janet in Training, and was one of the first BDSM stories I ever read. I agree, it's an excellent story. It took me ages to finish though, it's 700k!
The Challenge... I don't think I've read yet. Thanks for the tip!
LD