move all of our logging additions into the repository and the appropriate files