Added more logging. Logging NOT done yet.