Stop passing loggers around
Tests work
Tests really pass