Misc Commit

Miscellaneous Client and General Work