Cleaned up some code, support RPC calls within RPC calls, Defer actually does what it's supposed to. (hopefully)