Rewrite demo to be more Ruby-like [experimental]