Worked on states a bit.