Reorganized strain table.  Closes #12