Restore holding skeleton template for now