Preparing to add logging functionality