Add more scaffolding for demo with Fritz