1) Initial update for iOS 7
2) Old stuff that I never committed