Changed what client and server sends.

From ArrayList to HashMap