Some preparations and refactorings were already done in anticipation, but there's still a lot left to do.