Rewrote Logger and covered with test