Add ability to do initial data and generate