master

Data is now a real working tree, the next step is to find the better way to nest the data.