Progress… still far from done though