Added stuff to all states, and started work on camera