Started revising the variant creation system