Updated design to match client, examples and workbench. The design is preliminary.