Supplies: Now uses EPS saving
Ranks: Now uses EPS saving.  Issue #9 should now be fixed.