Update for secretQA
Fixed merge conflicts and am working on running tests