Moved all other code over to new logging style