Working on states

Now as classes