New logger and starting refactor
47% test coverage