Add states, uber states, and organized code into classes(all working)