- fix logging
 - try to figure out how to mock logger when doing unit tests