Implement missing rpc calls

They are really nasty, need to refactor