Still working on config validator plus factory refactoring
Merge branch 'mep' into sep
Refactored the factory so that each version is back to one method
merge conflicts new factory structure