First commit. Code is similar to 16_....but tries to clean up codeFix and keeping unique codeFix per view.