moving to actors and FSM (WIP)