Rearrange class finder params - actually getting valid responses now.