Revamped State Table

Lots of new stuff