Jeff - save&load commodities to a json file
Jeff - merge conflict