Moved to fix build, added FSM for transfers