Comment by Mustachio

PR submitted, comments by concerned coders with years experience in the system overruled and force merged with message "wcgw".