Small changes here and there
Templatize Fitness with the genotype also
Adapt to real usage