Change schema and fix specs.
Remove template.
Major Work In Progress - Still broken are: abilities, supplier admin ui, emails.