I would hold off on merging this commit until Sakshi's logging commit lands so that you can use the logging functions directly instead of adding them yourself and waiting for Sakshi to push her branch