Changed Some Classes, Started Working on FSM