Refactor and add tests

[JoeProgrammer88]

For future enhancements the project will need to be refactored and have some test coverage before we launch the 1.0 version