Complete the new logging infrastructure in a more proper fashion