Worked On States

I'm not finished. I found a bug I need to fix, don't have time right now
but I'll fix it.