Penultimate commit before datamining (hopefully)