Added some initial datagen stuff
General cleanup