huge commit of stuff