#3 Logging. Initial changes