First stab at schemas
Reformat