Refactoring the whole tool. Working on setting up unit tests