modifications to wire up the serv;let to the actual data generator
Merge branch 'master' of https://github.com/rehfeldchris/cmpe272