Client Modified Files Commit

First commit of modified client files. Straight seco7 merge, not
expected to compile as-is.