Working through to make sure that the validation works with 'overriding' some values in the analysis schema
Renamed and deleted some stuff