Update working (slowly...) comment out logging