Move to using templates, add /demo