Better state handling but now transfers are not working. Comitting to fix it at home.