MP Server implementation
Minor refactoring
Client side MP handshake
Refactoring