Cleaner handling of disconnect
Seperate wire-logic from rest