Fixing things

Using states and tables now