Corrected an error in the schema, made a very small start on the templates