huge, nasty commit