Logger: Implemented one TODO but added another