Moved over all updated logger files from develop branch