Move some registration to other states
This should make a bit more sense... (FSM2)