Cleaned up more code and adding state picker.
Fixed random “” but because of different copying and pasting into Xcode