Fixed scope issues, started work on new Client API methods