More work using view_state model