Updated demo to use my new template store library