-Add test for the existing project.
-Refactor.