Add tests, mockito, turn it into DI