Unit tests
Delete the old version.
Refactor  the service