Started work on data generator