WIP Second stage RPC refactor