(WIP) Cdodge/ecommerce improvements

Why is this commented out?