huge commit: almost done