Move variables out of Clear AIV space, add incxs

Move some of the variables the campaign wanted out of AIV territory,
and put them into rotation with the method. Also, start working on ways
to get incomplete data into some of these methods