There're many places (17) where we use ```core.State```, and many others (27) where we use ```model.State```. I'll try to change them all to use ```model.State```