Data2

@nockertsb please review after the data1 branch