Correctly build the state graph
Add timestamps and use them in addresses