Refactoring to get RPCs in order, hopefully