Add a brittle test for checking handshake; REDO THIS!
Make connection a different method; for threading later