Added a Logger & partial implementation