First rewrite. Structured data a little better