I might wait for #5 to be merged so that I can add in the logging