I think so, originally my plan was to split it all into smaller pieces to make them review- and mergeable individually.