First batch of stuff

@himedlooff @ascott1 @contolini
Yeah I can see how having to override a `demo` block could be annoying. Hmmm.