Fixed formatting, fixed imports, most of the way through testing full handshake.

Fixed formatting, fixed imports, most of the way through testing full handshake.