Added v2 of assembleTrainingData that tracks more features.