Partial refactor from RPC to Commands -- mostly just broke stuff.