Initial commodity work

Last push before I begin work on handling commodity actions :\