Merged Client_v2 and receiver

Have to debug and test the code.