Added VectorCalculation, Started working on factors.