Create initial data set up needs some more testing