WIP rewriting demo pages