Altered some classes to prepare for the GeneratorStrategy interface Austin and I are adding