Nearly working states

Oh so close.