Reverted to older branch and then readded Logging stuff. Things work (I think)