I've been doing it piecemeal so the giant commit is smaller in the future.