WIP: Refactor for reconnect