Basic generator functionality completed