Changed states around

Some testing with states.