more work on rpc stuff