More work on updated unadjusted tables

Changed order of comorbidities to match draft tables
Split into 2 tables to match draft
Set up tables, need to test