Adding a data generator and two methods of indexing as well as setting things up to be repeatable