initial commit, updated for iPhone 6