Start adding state and RPC