Making progress, better commit