@callumlocke wait until I've split out the logger