Minor Tweaks

Completed basic client object