add generated data and server population code
merge