SO COGS Refactoring
Numerous valuation changes