Removed no longer existent reference
Added ConditionData
Built new classes to replace global map/vec

Beginning of major, much more efficient, restructure.