Intial work on fixing reconnect logic

(or lack thereof)