Started adding Logging