Fixed formatting, fixed imports, most of the way through testing full handshake.
Merge pull request #5 from SamuelMarks/master

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