Closing until I am happy this is resolved and then will open for comments and updates.