Modified to work for QAnalysts... might be a better way to do this?

Made some modifications based upon how they are setup.  May need to tweak.