adding logging back in piece by piece