Removed handshake, moved it into peer file