Jeff - refactor commodity selection to its own class for reuse
Jeff - merge conflict