Finished changes to support first demo for non-spa app