Started refactoring Variations