Done. I did not commit anything from the analysis directory yet, so that we can do things one at a time here.