use better method for populating demo data

To work with Linda's upcoming code