Terribly large and unfocused commit