nasty huge commit