Readded the logger...not happy with the curent solution...