I know giant commits all at once like this are a bad thing, but too bad I worked without staging commits and now it's all here at once :)