Added in testing,
also started work on reconnect