Refactored the rules engine
Added the orphaned EVS rule into the rules engine
Merge branch 'working' into dev