Added Scalar Target from Codegen -- mucked about with the tests some.