Added type variable for method return type
Moved function
Improved type variable names
Started adding function to convert server methods into client methods