Functional, except invalid HTML
Use new checkout blocks