Started implementation on State System