Committing latest changes from PnET-WBM linkage, directly before start of modeling class