Started updating to support new state management features of Crystal.