Refactor.
Refactor.
Start testing subset.