Moving soil search into class