Another attempt
Merge https://github.com/thebritican/RPC-Assignment