massive progress and terrible commit all in one