From f186b025c257f0224218fe285302db235a4c90ef Mon Sep 17 00:00:00 2001
From: phil-hardwick <phil_hardwick@hotmail.co.uk>
Date: Wed, 10 Sep 2014 13:59:05 +0100
Subject: [PATCH] Added new qualifications card

---
 pinpoint2.xcodeproj/project.pbxproj         |  42 +++++++
 pinpoint2/Base.lproj/Main.storyboard        | 106 +++++++++++++++-
 pinpoint2/PPAppDelegate.m                   |   4 +
 pinpoint2/PPCard.h                          |   4 +-
 pinpoint2/PPCard.m                          |   8 --
 pinpoint2/PPCardCollectionViewController.h  |   3 +-
 pinpoint2/PPCardCollectionViewController.m  |  27 ++++-
 pinpoint2/PPCardService.m                   |   1 +
 pinpoint2/PPCellDismisser.h                 |  15 +++
 pinpoint2/PPJobCardProvider.m               |   4 +-
 pinpoint2/PPNextQualificationCard.h         |  13 ++
 pinpoint2/PPNextQualificationCard.m         |  33 +++++
 pinpoint2/PPNextQualificationCardProvider.h |  13 ++
 pinpoint2/PPNextQualificationCardProvider.m | 126 ++++++++++++++++++++
 pinpoint2/PPNonHtmlCard.h                   |  16 +++
 pinpoint2/PPNonHtmlCard.m                   |  34 ++++++
 pinpoint2/PPNonHtmlCardProvider.h           |  15 +++
 pinpoint2/PPNonHtmlCardProvider.m           |  23 ++++
 pinpoint2/PPQualificationQuestionCard.h     |  15 +++
 pinpoint2/PPQualificationQuestionCard.m     |  29 +++++
 pinpoint2/PPQualificationQuestionCell.h     |  19 +++
 pinpoint2/PPQualificationQuestionCell.m     |  63 ++++++++++
 pinpoint2/PPUserPreferencesStore.h          |   5 +-
 pinpoint2/PPUserPreferencesStore.m          |  55 +++++----
 pinpoint2/next-qualification-card.html      |  21 ++++
 pinpoint2Tests/pinpoint2Tests.m             |   7 --
 26 files changed, 646 insertions(+), 55 deletions(-)
 create mode 100644 pinpoint2/PPCellDismisser.h
 create mode 100644 pinpoint2/PPNextQualificationCard.h
 create mode 100644 pinpoint2/PPNextQualificationCard.m
 create mode 100644 pinpoint2/PPNextQualificationCardProvider.h
 create mode 100644 pinpoint2/PPNextQualificationCardProvider.m
 create mode 100644 pinpoint2/PPNonHtmlCard.h
 create mode 100644 pinpoint2/PPNonHtmlCard.m
 create mode 100644 pinpoint2/PPNonHtmlCardProvider.h
 create mode 100644 pinpoint2/PPNonHtmlCardProvider.m
 create mode 100644 pinpoint2/PPQualificationQuestionCard.h
 create mode 100644 pinpoint2/PPQualificationQuestionCard.m
 create mode 100644 pinpoint2/PPQualificationQuestionCell.h
 create mode 100644 pinpoint2/PPQualificationQuestionCell.m
 create mode 100644 pinpoint2/next-qualification-card.html

diff --git a/pinpoint2.xcodeproj/project.pbxproj b/pinpoint2.xcodeproj/project.pbxproj
index be70127..a6572f4 100644
--- a/pinpoint2.xcodeproj/project.pbxproj
+++ b/pinpoint2.xcodeproj/project.pbxproj
@@ -47,6 +47,13 @@
 		4A207BFA195D83D000ADBC76 /* PPJobCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A207BF9195D83D000ADBC76 /* PPJobCard.m */; };
 		4A207BFD195D997000ADBC76 /* PPWorkingFuturesCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A207BFC195D997000ADBC76 /* PPWorkingFuturesCard.m */; };
 		4A207BFF195F1FCB00ADBC76 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A207BFE195F1FCB00ADBC76 /* QuartzCore.framework */; };
+		4A25A24C19C0621E001DEECF /* PPQualificationQuestionCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A25A24B19C0621E001DEECF /* PPQualificationQuestionCard.m */; };
+		4A25A24F19C0625E001DEECF /* PPNonHtmlCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A25A24E19C0625E001DEECF /* PPNonHtmlCard.m */; };
+		4A25A25219C067B7001DEECF /* PPQualificationQuestionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A25A25119C067B7001DEECF /* PPQualificationQuestionCell.m */; };
+		4A25A25619C06C2F001DEECF /* PPNonHtmlCardProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A25A25519C06C2F001DEECF /* PPNonHtmlCardProvider.m */; };
+		4A25A25819C06F72001DEECF /* next-qualification-card.html in Resources */ = {isa = PBXBuildFile; fileRef = 4A25A25719C06F72001DEECF /* next-qualification-card.html */; };
+		4A25A25B19C06FCA001DEECF /* PPNextQualificationCardProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A25A25A19C06FCA001DEECF /* PPNextQualificationCardProvider.m */; };
+		4A25A25E19C06FF2001DEECF /* PPNextQualificationCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A25A25D19C06FF2001DEECF /* PPNextQualificationCard.m */; };
 		90A0FAF7A36C49B09F24D8EB /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 368FD67F4D394160AA34578D /* libPods.a */; };
 /* End PBXBuildFile section */
 
@@ -130,6 +137,20 @@
 		4A207BFB195D997000ADBC76 /* PPWorkingFuturesCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPWorkingFuturesCard.h; sourceTree = "<group>"; };
 		4A207BFC195D997000ADBC76 /* PPWorkingFuturesCard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPWorkingFuturesCard.m; sourceTree = "<group>"; };
 		4A207BFE195F1FCB00ADBC76 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		4A25A24A19C0621E001DEECF /* PPQualificationQuestionCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPQualificationQuestionCard.h; sourceTree = "<group>"; };
+		4A25A24B19C0621E001DEECF /* PPQualificationQuestionCard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPQualificationQuestionCard.m; sourceTree = "<group>"; };
+		4A25A24D19C0625E001DEECF /* PPNonHtmlCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPNonHtmlCard.h; sourceTree = "<group>"; };
+		4A25A24E19C0625E001DEECF /* PPNonHtmlCard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPNonHtmlCard.m; sourceTree = "<group>"; };
+		4A25A25019C067B7001DEECF /* PPQualificationQuestionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPQualificationQuestionCell.h; sourceTree = "<group>"; };
+		4A25A25119C067B7001DEECF /* PPQualificationQuestionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPQualificationQuestionCell.m; sourceTree = "<group>"; };
+		4A25A25319C06B0E001DEECF /* PPCellDismisser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PPCellDismisser.h; sourceTree = "<group>"; };
+		4A25A25419C06C2F001DEECF /* PPNonHtmlCardProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPNonHtmlCardProvider.h; sourceTree = "<group>"; };
+		4A25A25519C06C2F001DEECF /* PPNonHtmlCardProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPNonHtmlCardProvider.m; sourceTree = "<group>"; };
+		4A25A25719C06F72001DEECF /* next-qualification-card.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "next-qualification-card.html"; sourceTree = "<group>"; };
+		4A25A25919C06FCA001DEECF /* PPNextQualificationCardProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPNextQualificationCardProvider.h; sourceTree = "<group>"; };
+		4A25A25A19C06FCA001DEECF /* PPNextQualificationCardProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPNextQualificationCardProvider.m; sourceTree = "<group>"; };
+		4A25A25C19C06FF2001DEECF /* PPNextQualificationCard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PPNextQualificationCard.h; sourceTree = "<group>"; };
+		4A25A25D19C06FF2001DEECF /* PPNextQualificationCard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PPNextQualificationCard.m; sourceTree = "<group>"; };
 		C0B8BFE179394B65A5ECDCC7 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -224,6 +245,7 @@
 				4A207B9E195C212000ADBC76 /* pinpoint2-Prefix.pch */,
 				4A12161319BE44D80034ED6A /* unemployment-card.html */,
 				4A12162119BF60970034ED6A /* pay-region-card.html */,
+				4A25A25719C06F72001DEECF /* next-qualification-card.html */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -262,6 +284,12 @@
 				4A12161E19BF606D0034ED6A /* PPPayRegionCard.h */,
 				4A12161F19BF606D0034ED6A /* PPPayRegionCard.m */,
 				4A12162319C01F830034ED6A /* PPMultipleApiCallCard.h */,
+				4A25A24A19C0621E001DEECF /* PPQualificationQuestionCard.h */,
+				4A25A24B19C0621E001DEECF /* PPQualificationQuestionCard.m */,
+				4A25A24D19C0625E001DEECF /* PPNonHtmlCard.h */,
+				4A25A24E19C0625E001DEECF /* PPNonHtmlCard.m */,
+				4A25A25C19C06FF2001DEECF /* PPNextQualificationCard.h */,
+				4A25A25D19C06FF2001DEECF /* PPNextQualificationCard.m */,
 			);
 			name = Cards;
 			sourceTree = "<group>";
@@ -280,6 +308,9 @@
 				4A207BEB195D38C800ADBC76 /* PPLoadingCollectionViewCell.m */,
 				4A0E964A19B639300069A8C1 /* PPUserPreferencesViewController.h */,
 				4A0E964B19B639300069A8C1 /* PPUserPreferencesViewController.m */,
+				4A25A25019C067B7001DEECF /* PPQualificationQuestionCell.h */,
+				4A25A25119C067B7001DEECF /* PPQualificationQuestionCell.m */,
+				4A25A25319C06B0E001DEECF /* PPCellDismisser.h */,
 			);
 			name = "Controllers and View";
 			sourceTree = "<group>";
@@ -300,6 +331,10 @@
 				4A12161619BE46790034ED6A /* PPUnemploymentCardProvider.m */,
 				4A12161B19BF5F8D0034ED6A /* PPPayRegionCardProvider.h */,
 				4A12161C19BF5F8D0034ED6A /* PPPayRegionCardProvider.m */,
+				4A25A25419C06C2F001DEECF /* PPNonHtmlCardProvider.h */,
+				4A25A25519C06C2F001DEECF /* PPNonHtmlCardProvider.m */,
+				4A25A25919C06FCA001DEECF /* PPNextQualificationCardProvider.h */,
+				4A25A25A19C06FCA001DEECF /* PPNextQualificationCardProvider.m */,
 			);
 			name = "Card Data Providers";
 			sourceTree = "<group>";
@@ -402,6 +437,7 @@
 				4A207BA9195C212000ADBC76 /* Images.xcassets in Resources */,
 				4A12161419BE44D80034ED6A /* unemployment-card.html in Resources */,
 				4A207B9B195C212000ADBC76 /* InfoPlist.strings in Resources */,
+				4A25A25819C06F72001DEECF /* next-qualification-card.html in Resources */,
 				4A207BF2195D400A00ADBC76 /* jquery-2.1.0.min.js in Resources */,
 				4A207BF1195D400A00ADBC76 /* Chart.js in Resources */,
 				4A207BE0195C3C7100ADBC76 /* job-card.html in Resources */,
@@ -458,14 +494,20 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4A25A25E19C06FF2001DEECF /* PPNextQualificationCard.m in Sources */,
 				4A207BD1195C2FF200ADBC76 /* PPCard.m in Sources */,
+				4A25A25B19C06FCA001DEECF /* PPNextQualificationCardProvider.m in Sources */,
 				4A207BCA195C230E00ADBC76 /* PPCardCollectionViewCell.m in Sources */,
 				4A207BDA195C343500ADBC76 /* PPJobCardProvider.m in Sources */,
+				4A25A25619C06C2F001DEECF /* PPNonHtmlCardProvider.m in Sources */,
 				4A207BC7195C226C00ADBC76 /* PPCardCollectionViewController.m in Sources */,
 				4A207BA1195C212000ADBC76 /* PPAppDelegate.m in Sources */,
+				4A25A24C19C0621E001DEECF /* PPQualificationQuestionCard.m in Sources */,
 				4A207BE6195C4BE900ADBC76 /* PPUserPreferencesStore.m in Sources */,
 				4A207BEC195D38C800ADBC76 /* PPLoadingCollectionViewCell.m in Sources */,
 				4A207BFA195D83D000ADBC76 /* PPJobCard.m in Sources */,
+				4A25A25219C067B7001DEECF /* PPQualificationQuestionCell.m in Sources */,
+				4A25A24F19C0625E001DEECF /* PPNonHtmlCard.m in Sources */,
 				4A207BCE195C2EB600ADBC76 /* PPCardService.m in Sources */,
 				4A207BDE195C39A300ADBC76 /* PPCardProvider.m in Sources */,
 				4A207BFD195D997000ADBC76 /* PPWorkingFuturesCard.m in Sources */,
diff --git a/pinpoint2/Base.lproj/Main.storyboard b/pinpoint2/Base.lproj/Main.storyboard
index 029cc2e..9effcd6 100644
--- a/pinpoint2/Base.lproj/Main.storyboard
+++ b/pinpoint2/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="FmE-h9-rSq">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="FmE-h9-rSq">
     <dependencies>
-        <deployment defaultVersion="1808" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+        <deployment defaultVersion="1792" identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
     <scenes>
         <!--Card Collection View Controller-->
@@ -51,9 +51,107 @@
                                     <outlet property="webViewLoadingIndicator" destination="Rqt-eX-qs8" id="RBn-nc-bTh"/>
                                 </connections>
                             </collectionViewCell>
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PPQualificationQuestionCell" id="t9V-5f-Mvx" customClass="PPQualificationQuestionCell">
+                                <rect key="frame" x="10" y="320" width="300" height="300"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What is your current qualification?" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xPt-eF-Bcj">
+                                            <rect key="frame" x="19" y="20" width="262" height="21"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="5l1-O0-zcy">
+                                            <rect key="frame" x="19" y="60" width="89" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="Below GCSE">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="gWN-dm-SXj"/>
+                                            </connections>
+                                        </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="eCT-lW-YYd">
+                                            <rect key="frame" x="43" y="98" width="42" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="GCSE">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="tCI-A7-IWB"/>
+                                            </connections>
+                                        </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="25a-hH-oPC">
+                                            <rect key="frame" x="34" y="129" width="58" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="A Levels">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="Snq-0k-I9T"/>
+                                            </connections>
+                                        </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="vif-7E-tUX">
+                                            <rect key="frame" x="5" y="167" width="116" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="Diploma/Cert HE">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="VO6-VO-Hi5"/>
+                                            </connections>
+                                        </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="MkL-dP-u37">
+                                            <rect key="frame" x="10" y="215" width="184" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="Dip HE/Foundation Degree">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="1vY-nh-SsK"/>
+                                            </connections>
+                                        </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="JLd-eL-sYe">
+                                            <rect key="frame" x="10" y="253" width="122" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="Bachelors Degree">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="PbI-pg-1pF"/>
+                                            </connections>
+                                        </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Dsw-OY-kSw">
+                                            <rect key="frame" x="149" y="115" width="55" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="Masters">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="hcH-0H-VkX"/>
+                                            </connections>
+                                        </button>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Khe-3L-tJ0">
+                                            <rect key="frame" x="154" y="162" width="68" height="30"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <state key="normal" title="Doctorate">
+                                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                            </state>
+                                            <connections>
+                                                <action selector="qualificationSelected:" destination="t9V-5f-Mvx" eventType="touchUpInside" id="ncq-SE-26v"/>
+                                            </connections>
+                                        </button>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                            </collectionViewCell>
                         </cells>
                         <collectionReusableView key="sectionFooterView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="loadingCell" id="rik-nd-gQq" customClass="PPLoadingCollectionViewCell">
-                            <rect key="frame" x="0.0" y="320" width="320" height="50"/>
+                            <rect key="frame" x="0.0" y="630" width="320" height="50"/>
                             <autoresizingMask key="autoresizingMask"/>
                             <subviews>
                                 <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" id="tK7-DV-dDf">
diff --git a/pinpoint2/PPAppDelegate.m b/pinpoint2/PPAppDelegate.m
index 40721f2..8d0dd99 100644
--- a/pinpoint2/PPAppDelegate.m
+++ b/pinpoint2/PPAppDelegate.m
@@ -11,6 +11,8 @@
 #import "PPWorkingFuturesCardProvider.h"
 #import "PPUnemploymentCardProvider.h"
 #import "PPPayRegionCardProvider.h"
+#import "PPNonHtmlCardProvider.h"
+#import "PPNextQualificationCardProvider.h"
 #import "PPCardService.h"
 
 @implementation PPAppDelegate
@@ -24,6 +26,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [[PPWorkingFuturesCardProvider alloc] initWithCardService:[PPCardService sharedInstance]];
     [[PPUnemploymentCardProvider alloc] initWithCardService:[PPCardService sharedInstance]];
     [[PPPayRegionCardProvider alloc] initWithCardService:[PPCardService sharedInstance]];
+    [[PPNonHtmlCardProvider alloc] initWithCardService:[PPCardService sharedInstance]];
+    [[PPNextQualificationCardProvider alloc] initWithCardService:[PPCardService sharedInstance]];
     #pragma clang diagnostic pop
     [[UINavigationBar appearance] setBackgroundColor:[UIColor orangeColor]];
     
diff --git a/pinpoint2/PPCard.h b/pinpoint2/PPCard.h
index f2e0b31..8a5decd 100644
--- a/pinpoint2/PPCard.h
+++ b/pinpoint2/PPCard.h
@@ -14,8 +14,8 @@
 #import "PPMultipleApiCallCard.h"
 
 typedef NS_ENUM(NSInteger, PPCardType) {
-    PPCardTypeJob,
-    PPCardTypeWorkingFutures
+    PPCardTypeHtml,
+    PPcardTypeNonHtml
 };
 
 @interface PPCard : NSObject <PPDismissableCard, PPCardRelevancy, PPMultipleApiCallCard, NSCoding> {
diff --git a/pinpoint2/PPCard.m b/pinpoint2/PPCard.m
index e0e25db..7b4d730 100644
--- a/pinpoint2/PPCard.m
+++ b/pinpoint2/PPCard.m
@@ -101,14 +101,6 @@ - (bool)isAllDataPresent {
     return true;
 }
 
-- (void)handleLike {
-    
-}
-
-- (void)handleDislike {
-    
-}
-
 - (void)encodeWithCoder:(NSCoder *)coder;
 {
     [coder encodeObject:self.html forKey:@"html"];
diff --git a/pinpoint2/PPCardCollectionViewController.h b/pinpoint2/PPCardCollectionViewController.h
index ce4c8fc..eb7fa34 100644
--- a/pinpoint2/PPCardCollectionViewController.h
+++ b/pinpoint2/PPCardCollectionViewController.h
@@ -9,8 +9,9 @@
 #import <UIKit/UIKit.h>
 #import "PPCardActionDelegate.h"
 #import "PPCardService.h"
+#import "PPCellDismisser.h"
 
-@interface PPCardCollectionViewController : UICollectionViewController <PPCardActionDelegate>
+@interface PPCardCollectionViewController : UICollectionViewController <PPCardActionDelegate, PPCellDismisser>
 
 @property (strong, nonatomic) PPCardService *cardService;
 @property (strong, nonatomic) NSMutableArray *cards;
diff --git a/pinpoint2/PPCardCollectionViewController.m b/pinpoint2/PPCardCollectionViewController.m
index b307663..f9e864d 100644
--- a/pinpoint2/PPCardCollectionViewController.m
+++ b/pinpoint2/PPCardCollectionViewController.m
@@ -10,6 +10,8 @@
 #import "PPCardCollectionViewCell.h"
 #import "PPCollectionViewFlowLayout.h"
 #import "PPLoadingCollectionViewCell.h"
+#import "PPNonHtmlCard.h"
+#import "PPQualificationQuestionCell.h"
 
 #define MIN_NUM_CARDS 5
 
@@ -53,11 +55,20 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe
 }
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-    PPCardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cardCell" forIndexPath:indexPath];
-    cell.card = [self.cards objectAtIndex:indexPath.row];
-    [cell configureCard];
-    cell.cardActionDelegate = self;
-    return cell;
+    PPCard *card = ((PPCard *)[self.cards objectAtIndex:indexPath.row]);
+    if (card.cardType == PPcardTypeNonHtml) {
+        PPNonHtmlCard *nonHtmlCard = (PPNonHtmlCard *)card;
+        PPQualificationQuestionCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:nonHtmlCard.nameOfCell forIndexPath:indexPath];
+        [cell setCellDismisserDelegate:self];
+        [cell configureCard];
+        return cell;
+    } else {
+        PPCardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cardCell" forIndexPath:indexPath];
+        cell.card = [self.cards objectAtIndex:indexPath.row];
+        [cell configureCard];
+        cell.cardActionDelegate = self;
+        return cell;
+    }
 }
 
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath {
@@ -128,6 +139,12 @@ - (void)loadMoreCards:(id)sender {
     [self getCardsFromCardService:3];
 }
 
+- (void)dismissCell:(UICollectionViewCell *)cell {
+    NSIndexPath *indexPath = [self.collectionView indexPathForCell:cell];
+    [self.cards removeObjectAtIndex:indexPath.item];
+    [self.collectionView deleteItemsAtIndexPaths:@[indexPath]];
+}
+
 /*
 #pragma mark - Navigation
 
diff --git a/pinpoint2/PPCardService.m b/pinpoint2/PPCardService.m
index c86b3ad..c9168d4 100644
--- a/pinpoint2/PPCardService.m
+++ b/pinpoint2/PPCardService.m
@@ -17,6 +17,7 @@ - (instancetype)init {
         cardsUnfinished = [[NSMutableArray alloc] init];
         cardProviders = [[NSMutableArray alloc] init];
         timer = [NSTimer scheduledTimerWithTimeInterval:4.0f target:self selector:@selector(getCardsFromProviders) userInfo:nil repeats:YES];
+        [self getCardsFromProviders];
     }
     return self;
 }
diff --git a/pinpoint2/PPCellDismisser.h b/pinpoint2/PPCellDismisser.h
new file mode 100644
index 0000000..eed4b84
--- /dev/null
+++ b/pinpoint2/PPCellDismisser.h
@@ -0,0 +1,15 @@
+//
+//  PPCellDismisser.h
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol PPCellDismisser <NSObject>
+
+- (void)dismissCell:(UICollectionViewCell *)cell;
+
+@end
diff --git a/pinpoint2/PPJobCardProvider.m b/pinpoint2/PPJobCardProvider.m
index f3f0058..5c7af3b 100644
--- a/pinpoint2/PPJobCardProvider.m
+++ b/pinpoint2/PPJobCardProvider.m
@@ -23,7 +23,7 @@ - (PPCard *)provideCardFromUserPreferences:(PPUserPreferences *)userPreferences
         NSDictionary *socDetails = (NSDictionary *)responseObject[arc4random_uniform((uint)((NSArray *)responseObject).count)];
         [card addDataToCard:socDetails];
         [card setCardAsFinishedIfDataIsAllPresentAndRenderTheHtml];
-        [card setCardType:PPCardTypeJob];
+        [card setCardType:PPCardTypeHtml];
     } failure:^(AFHTTPRequestOperation *operation, NSError *error){
         NSLog(@"getting job details failed: %@", error);
     }];
@@ -36,7 +36,7 @@ - (PPCard *)provideRandomJobCardAttachedToUserPreferences:(PPUserPreferences *)u
         NSDictionary *socDetails = (NSDictionary *)responseObject;
         [card addDataToCard:socDetails];
         [card setCardAsFinishedIfDataIsAllPresentAndRenderTheHtml];
-        [card setCardType:PPCardTypeJob];
+        [card setCardType:PPCardTypeHtml];
     } failure:^(AFHTTPRequestOperation *operation, NSError *error){
         NSLog(@"getting job details failed: %@", error);
     }];
diff --git a/pinpoint2/PPNextQualificationCard.h b/pinpoint2/PPNextQualificationCard.h
new file mode 100644
index 0000000..8c9b1a9
--- /dev/null
+++ b/pinpoint2/PPNextQualificationCard.h
@@ -0,0 +1,13 @@
+//
+//  PPNextQualificationCard.h
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPCard.h"
+
+@interface PPNextQualificationCard : PPCard
+
+@end
diff --git a/pinpoint2/PPNextQualificationCard.m b/pinpoint2/PPNextQualificationCard.m
new file mode 100644
index 0000000..e3d4010
--- /dev/null
+++ b/pinpoint2/PPNextQualificationCard.m
@@ -0,0 +1,33 @@
+//
+//  PPNextQualificationCard.m
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPNextQualificationCard.h"
+
+@implementation PPNextQualificationCard
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.html = [self getHtmlTemplateStringFromName:@"next-qualification-card"];
+    }
+    return self;
+}
+
+- (void)handleLike {
+    [super handleLike];
+}
+
+- (void)handleDislike {
+    
+}
+
+- (NSArray *)listOfDataKeysThatMustBePresentToIndicateThatAllCallsToApiHaveBeenMade {
+    return @[@"title", @"payBreakdown", @"workingFuturesBreakdown", @"unemploymentBreakdown"];
+}
+
+@end
diff --git a/pinpoint2/PPNextQualificationCardProvider.h b/pinpoint2/PPNextQualificationCardProvider.h
new file mode 100644
index 0000000..9ae1975
--- /dev/null
+++ b/pinpoint2/PPNextQualificationCardProvider.h
@@ -0,0 +1,13 @@
+//
+//  PPNextQualificationCardProvider.h
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPCardProvider.h"
+
+@interface PPNextQualificationCardProvider : PPCardProvider
+
+@end
diff --git a/pinpoint2/PPNextQualificationCardProvider.m b/pinpoint2/PPNextQualificationCardProvider.m
new file mode 100644
index 0000000..ae97358
--- /dev/null
+++ b/pinpoint2/PPNextQualificationCardProvider.m
@@ -0,0 +1,126 @@
+//
+//  PPNextQualificationCardProvider.m
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPNextQualificationCardProvider.h"
+#import "PPNextQualificationCard.h"
+
+@implementation PPNextQualificationCardProvider
+
+- (PPCard *)provideCardFromUserPreferences:(PPUserPreferences *)userPreferences {
+    if (!userPreferences.currentQualificationLevel) {
+        return nil;
+    }
+    PPNextQualificationCard *card = [[PPNextQualificationCard alloc] initWithUserPreferences:userPreferences];
+    NSString *socCode = [self getUnusedSocCodeFromArrayOfPossibles:userPreferences.likedJobs usingNSDefaultsKeyForUsedCodes:@"nextQualificationUsedSocCodes"];
+    if (!socCode) {
+        return nil;
+    }
+    [apiClient GET:@"ashe/estimatePay" parameters:@{@"soc":socCode, @"breakdown":@"qualification"} success:^(AFHTTPRequestOperation *operation, id response){
+        NSDictionary *responseDict = (NSDictionary *)response;
+        NSArray *breakdown = responseDict[@"series"][0][@"breakdown"];
+        NSMutableArray *arrayOfReadableData = [[NSMutableArray alloc] init];
+        for (NSDictionary *qualificationAndPay in breakdown) {
+            int qualInt = [qualificationAndPay[@"qualification"] integerValue];
+            int userQualInt = [userPreferences.currentQualificationLevel integerValue];
+            if (qualInt < userQualInt || qualInt > userQualInt + 1) {
+                //just want the data for current user qual and next qual up
+                continue;
+            }
+            NSMutableDictionary *mutableQualificationAndPay = [qualificationAndPay mutableCopy];
+            NSString *qualCodeString = [NSString stringWithFormat:@"%d", [qualificationAndPay[@"qualification"] integerValue]];
+            [mutableQualificationAndPay setObject:[self getQualificationNameFromCode:qualCodeString] forKey:@"qualificationName"];
+            [mutableQualificationAndPay setObject:[self getAnnualPayFromWeeklyPay:qualificationAndPay[@"estpay"]] forKey:@"yearlyPay"];
+            [arrayOfReadableData addObject:mutableQualificationAndPay];
+        }
+        [card addDataToCard:@{@"payBreakdown":arrayOfReadableData}];
+        [card setCardAsFinishedIfDataIsAllPresentAndRenderTheHtml];
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error){
+        NSLog(@"error: %@", error);
+    }];
+    [apiClient GET:@"wf/predict/breakdown/qualification" parameters:@{@"soc":socCode} success:^(AFHTTPRequestOperation *operation, id response){
+        NSDictionary *responseDict = (NSDictionary *)response;
+        NSArray *breakdown = responseDict[@"predictedEmployment"][0][@"breakdown"];
+        NSMutableArray *arrayOfReadableData = [[NSMutableArray alloc] init];
+        for (NSDictionary *qualificationAndEmployment in breakdown) {
+            int qualInt = [qualificationAndEmployment[@"code"] integerValue];
+            int userQualInt = [userPreferences.currentQualificationLevel integerValue];
+            if (qualInt < userQualInt || qualInt > userQualInt + 1) {
+                //just want the data for current user qual and next qual up
+                continue;
+            }
+            NSMutableDictionary *mutableQualificationAndPay = [qualificationAndEmployment mutableCopy];
+            NSString *qualCodeString = [NSString stringWithFormat:@"%d", [qualificationAndEmployment[@"code"] integerValue]];
+            [mutableQualificationAndPay setObject:[self getQualificationNameFromCode:qualCodeString] forKey:@"qualificationName"];
+            [mutableQualificationAndPay setObject:[NSString stringWithFormat:@"%ld", [qualificationAndEmployment[@"employment"] longValue]] forKey:@"numberOfJobsAvailable"];
+            [arrayOfReadableData addObject:mutableQualificationAndPay];
+        }
+        [card addDataToCard:@{@"workingFuturesBreakdown":arrayOfReadableData}];
+        [card setCardAsFinishedIfDataIsAllPresentAndRenderTheHtml];
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error){
+        NSLog(@"error: %@", error);
+    }];
+    NSMutableArray *arrayOfReadableUnemploymentData = [[NSMutableArray alloc] init];
+    [apiClient GET:@"lfs/unemployment" parameters:@{@"soc":socCode, @"nqf8":userPreferences.currentQualificationLevel} success:^(AFHTTPRequestOperation *operation, id response){
+        NSDictionary *responseDict = (NSDictionary *)response;
+        NSArray *years = responseDict[@"years"];
+        NSDictionary *yearOfUnemploymentData = [years lastObject];
+        [arrayOfReadableUnemploymentData addObject:@{@"qualificationName":[self getQualificationNameFromCode:userPreferences.currentQualificationLevel], @"unemploymentRate":yearOfUnemploymentData[@"unemprate"]}];
+        if (arrayOfReadableUnemploymentData.count == 2) {
+            [card addDataToCard:@{@"unemploymentBreakdown":arrayOfReadableUnemploymentData}];
+            [card setCardAsFinishedIfDataIsAllPresentAndRenderTheHtml];
+        }
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error){
+        NSLog(@"error: %@", error);
+    }];
+    [apiClient GET:@"lfs/unemployment" parameters:@{@"soc":socCode, @"nqf8":@([userPreferences.currentQualificationLevel integerValue] + 1)} success:^(AFHTTPRequestOperation *operation, id response){
+        NSDictionary *responseDict = (NSDictionary *)response;
+        NSArray *years = responseDict[@"years"];
+        NSDictionary *yearOfUnemploymentData = [years lastObject];
+        [arrayOfReadableUnemploymentData addObject:@{@"qualificationName":[self getQualificationNameFromCode:userPreferences.currentQualificationLevel], @"unemploymentRate":yearOfUnemploymentData[@"unemprate"]}];
+        if (arrayOfReadableUnemploymentData.count == 2) {
+            [card addDataToCard:@{@"unemploymentBreakdown":arrayOfReadableUnemploymentData}];
+            [card setCardAsFinishedIfDataIsAllPresentAndRenderTheHtml];
+        }
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error){
+        NSLog(@"error: %@", error);
+    }];
+    [apiClient GET:[NSString stringWithFormat:@"soc/code/%@", socCode] parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject){
+        NSDictionary *socDetails = (NSDictionary *)responseObject;
+        [card addDataToCard:socDetails];
+        [card setCardAsFinishedIfDataIsAllPresentAndRenderTheHtml];
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error){
+        NSLog(@"getting job details failed: %@", error);
+    }];
+    return card;
+}
+
+- (NSString *)getQualificationNameFromCode:(NSString *)code {
+    return [self qualificationNamesMappedToCodes][code];
+}
+
+- (NSString *)getAnnualPayFromWeeklyPay:(NSString *)weeklyPayString {
+    int weeklyPay = (int)[weeklyPayString integerValue];
+    int annualPay = weeklyPay*52;
+    return [NSString stringWithFormat:@"%d", annualPay];
+}
+
+- (NSDictionary *)qualificationNamesMappedToCodes {
+    return @{
+             @"9":@"No Qualification",
+             @"8":@"Below GCSE",
+             @"7":@"GCSE",
+             @"6":@"A Level",
+             @"5":@"Diploma/Cert HE",
+             @"4":@"Dip HE/Foundation Degree",
+             @"3":@"Bachelors Degree",
+             @"2":@"Masters",
+             @"1":@"Doctorate"
+             };
+}
+
+@end
diff --git a/pinpoint2/PPNonHtmlCard.h b/pinpoint2/PPNonHtmlCard.h
new file mode 100644
index 0000000..9ae2a7e
--- /dev/null
+++ b/pinpoint2/PPNonHtmlCard.h
@@ -0,0 +1,16 @@
+//
+//  PPNonHtmlCard.h
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "PPCard.h"
+
+@interface PPNonHtmlCard : PPCard
+
+@property (retain, nonatomic) NSString *nameOfCell;
+
+@end
diff --git a/pinpoint2/PPNonHtmlCard.m b/pinpoint2/PPNonHtmlCard.m
new file mode 100644
index 0000000..bc98c90
--- /dev/null
+++ b/pinpoint2/PPNonHtmlCard.m
@@ -0,0 +1,34 @@
+//
+//  PPNonHtmlCard.m
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPNonHtmlCard.h"
+
+@implementation PPNonHtmlCard
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.cardType = PPcardTypeNonHtml;
+        self.isFinished = @(YES);
+    }
+    return self;
+}
+
+- (void)handleLike {
+    
+}
+
+- (void)handleDislike {
+    
+}
+
+- (bool)cardCanBeOutOfDate {
+    return NO;
+}
+
+@end
diff --git a/pinpoint2/PPNonHtmlCardProvider.h b/pinpoint2/PPNonHtmlCardProvider.h
new file mode 100644
index 0000000..60be01d
--- /dev/null
+++ b/pinpoint2/PPNonHtmlCardProvider.h
@@ -0,0 +1,15 @@
+//
+//  PPNonHtmlCardProvider.h
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPCardProvider.h"
+
+@interface PPNonHtmlCardProvider : PPCardProvider {
+    bool hasSentQualificationsQuestion;
+}
+
+@end
diff --git a/pinpoint2/PPNonHtmlCardProvider.m b/pinpoint2/PPNonHtmlCardProvider.m
new file mode 100644
index 0000000..003647b
--- /dev/null
+++ b/pinpoint2/PPNonHtmlCardProvider.m
@@ -0,0 +1,23 @@
+//
+//  PPNonHtmlCardProvider.m
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPNonHtmlCardProvider.h"
+#import "PPQualificationQuestionCard.h"
+
+@implementation PPNonHtmlCardProvider
+
+- (PPCard *)provideCardFromUserPreferences:(PPUserPreferences *)userPreferences {
+    if (!userPreferences.currentQualificationLevel && !hasSentQualificationsQuestion) {
+        PPQualificationQuestionCard *card = [[PPQualificationQuestionCard alloc] init];
+        hasSentQualificationsQuestion = YES;
+        return card;
+    }
+    return nil;
+}
+
+@end
diff --git a/pinpoint2/PPQualificationQuestionCard.h b/pinpoint2/PPQualificationQuestionCard.h
new file mode 100644
index 0000000..9356cc6
--- /dev/null
+++ b/pinpoint2/PPQualificationQuestionCard.h
@@ -0,0 +1,15 @@
+//
+//  PPQualificationQuestionCard.h
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPNonHtmlCard.h"
+
+@interface PPQualificationQuestionCard : PPNonHtmlCard
+
+
+
+@end
diff --git a/pinpoint2/PPQualificationQuestionCard.m b/pinpoint2/PPQualificationQuestionCard.m
new file mode 100644
index 0000000..1c45641
--- /dev/null
+++ b/pinpoint2/PPQualificationQuestionCard.m
@@ -0,0 +1,29 @@
+//
+//  PPQualificationQuestionCard.m
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPQualificationQuestionCard.h"
+
+@implementation PPQualificationQuestionCard
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.nameOfCell = @"PPQualificationQuestionCell";
+    }
+    return self;
+}
+
+- (void)handleLike {
+    
+}
+
+- (void)handleDislike {
+    
+}
+
+@end
diff --git a/pinpoint2/PPQualificationQuestionCell.h b/pinpoint2/PPQualificationQuestionCell.h
new file mode 100644
index 0000000..46b3808
--- /dev/null
+++ b/pinpoint2/PPQualificationQuestionCell.h
@@ -0,0 +1,19 @@
+//
+//  PPQualificationQuestionCell.h
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "PPCellDismisser.h"
+
+@interface PPQualificationQuestionCell : UICollectionViewCell
+
+- (IBAction)qualificationSelected:(UIButton *)sender;
+- (void)configureCard;
+
+@property (weak) id<PPCellDismisser> cellDismisserDelegate;
+
+@end
diff --git a/pinpoint2/PPQualificationQuestionCell.m b/pinpoint2/PPQualificationQuestionCell.m
new file mode 100644
index 0000000..c687634
--- /dev/null
+++ b/pinpoint2/PPQualificationQuestionCell.m
@@ -0,0 +1,63 @@
+//
+//  PPQualificationQuestionCell.m
+//  pinpoint2
+//
+//  Created by Philip Hardwick on 10/09/2014.
+//  Copyright (c) 2014 Philip Hardwick. All rights reserved.
+//
+
+#import "PPQualificationQuestionCell.h"
+#import "PPUserPreferencesStore.h"
+
+@implementation PPQualificationQuestionCell
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        // Initialization code
+    }
+    return self;
+}
+
+- (void)configureCard {
+    [self setUpCardLook];
+}
+
+- (void)setUpCardLook {
+    [[self contentView] setBackgroundColor:[UIColor whiteColor]];
+    [self setBackgroundColor:[UIColor clearColor]];
+    CALayer *contentViewlayer = [[self contentView] layer];
+    CALayer *celllayer = [self layer];
+    [contentViewlayer setMasksToBounds:YES];
+    [contentViewlayer setCornerRadius:2.0f];
+    [contentViewlayer setRasterizationScale:[[UIScreen mainScreen] scale]];
+    [contentViewlayer setShouldRasterize:YES];
+    [celllayer setShadowColor:[[UIColor blackColor] CGColor]];
+    [celllayer setShadowOffset:CGSizeMake(0.0f, 0.0f)];
+    [celllayer setShadowRadius:6.0f];
+    [celllayer setShadowOpacity:0.3f];
+    [celllayer setShadowPath:[[UIBezierPath bezierPathWithRoundedRect:self.bounds cornerRadius:2.0f] CGPath]];
+}
+
+- (void)qualificationSelected:(UIButton *)sender {
+    NSString *code = [self qualificationNamesMappedToCodes][sender.titleLabel.text];
+    [[PPUserPreferencesStore sharedInstance] setCurrentQualificationCodeNumber:code];
+    [self.cellDismisserDelegate dismissCell:self];
+}
+
+- (NSDictionary *)qualificationNamesMappedToCodes {
+    return @{
+             @"No Qualification":@"9",
+             @"Below GCSE":@"8",
+             @"GCSE": @"7",
+             @"A Levels": @"6",
+             @"Diploma/Cert HE": @"5",
+             @"Dip HE/Foundation Degree":@"4",
+             @"Bachelors Degree":@"3",
+             @"Masters":@"2",
+             @"Doctorate":@"1"
+             };
+}
+
+@end
diff --git a/pinpoint2/PPUserPreferencesStore.h b/pinpoint2/PPUserPreferencesStore.h
index 87b22f0..e26ebfb 100644
--- a/pinpoint2/PPUserPreferencesStore.h
+++ b/pinpoint2/PPUserPreferencesStore.h
@@ -18,8 +18,9 @@
 - (NSArray *)getArrayOfKeywordsAndPointsOrderedByPoints;
 - (void)addLikedJobData:(NSDictionary *)jobData;
 - (PPUserPreferences *)getCurrentUserPreferences;
-- (void)saveCard:(NSObject *)card forSocCode:(NSString *)socCode;
-- (NSArray *)getSavedCardsForSocCode:(NSString *)socCode;
+- (void)setCurrentQualificationCodeNumber:(NSString *)code;
+//- (void)saveCard:(NSObject *)card forSocCode:(NSString *)socCode;
+//- (NSArray *)getSavedCardsForSocCode:(NSString *)socCode;
 - (bool)userPreferencesAreOutOfDate:(PPUserPreferences *)userPreferences;
 + (instancetype)sharedInstance;
 
diff --git a/pinpoint2/PPUserPreferencesStore.m b/pinpoint2/PPUserPreferencesStore.m
index cb35635..6ff0778 100644
--- a/pinpoint2/PPUserPreferencesStore.m
+++ b/pinpoint2/PPUserPreferencesStore.m
@@ -68,30 +68,8 @@ - (void) addLikedJobData:(NSDictionary *)jobData  {
     [self incrementVersionOfUserPreferences];
 }
 
-- (void)saveCard:(NSObject *)card forSocCode:(NSString *)socCode {
-    NSMutableDictionary *savedCards = [defaults objectForKey:@"savedCards"];
-    if (!savedCards) {
-        savedCards = [[NSMutableDictionary alloc] init];
-    }
-    NSMutableArray *savedCardsForSocCode = [savedCards objectForKey:socCode];
-    if (!savedCardsForSocCode) {
-        savedCardsForSocCode = [[NSMutableArray alloc] init];
-        [savedCards setObject:savedCardsForSocCode forKey:socCode];
-    }
-    [savedCardsForSocCode addObject:[NSKeyedArchiver archivedDataWithRootObject:card]];
-    [savedCards setObject:savedCardsForSocCode forKey:socCode];
-    [defaults setObject:savedCards forKey:@"savedCards"];
-}
-
-- (NSArray *)getSavedCardsForSocCode:(NSString *)socCode {
-    NSDictionary *savedCards = [defaults objectForKey:@"savedCards"];
-    NSMutableArray *savedCardsForSocCode = [savedCards objectForKey:socCode];
-    NSMutableArray *unarchivedCards = [[NSMutableArray alloc] init];
-    for (NSData *data in savedCardsForSocCode) {
-        NSObject *card = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-        [unarchivedCards addObject:card];
-    }
-    return unarchivedCards;
+- (void)setCurrentQualificationCodeNumber:(NSString *)code {
+    [defaults setObject:code forKey:@"qualificationCode"];
 }
 
 - (PPUserPreferences *)getCurrentUserPreferences {
@@ -102,6 +80,7 @@ - (PPUserPreferences *)getCurrentUserPreferences {
         [userPrefs setJobKeywords:[self getArrayOfTopFiveKeywordsOrderedByPoints]];
     }
     [userPrefs setVersionOfPreferences:@([self getVersionOfUserPreferences])];
+    [userPrefs setCurrentQualificationLevel:[defaults stringForKey:@"qualificationCode"]];
     return userPrefs;
 }
 
@@ -133,4 +112,32 @@ - (NSArray*)getArrayOfKeywordsAndPointsOrderedByPoints{
     return nil;
 }
 
+///IN CASE WE NEED IT
+//- (void)saveCard:(NSObject *)card forSocCode:(NSString *)socCode {
+//    NSMutableDictionary *savedCards = [defaults objectForKey:@"savedCards"];
+//    if (!savedCards) {
+//        savedCards = [[NSMutableDictionary alloc] init];
+//    }
+//    NSMutableArray *savedCardsForSocCode = [savedCards objectForKey:socCode];
+//    if (!savedCardsForSocCode) {
+//        savedCardsForSocCode = [[NSMutableArray alloc] init];
+//        [savedCards setObject:savedCardsForSocCode forKey:socCode];
+//    }
+//    [savedCardsForSocCode addObject:[NSKeyedArchiver archivedDataWithRootObject:card]];
+//    [savedCards setObject:savedCardsForSocCode forKey:socCode];
+//    [defaults setObject:savedCards forKey:@"savedCards"];
+//}
+//
+//- (NSArray *)getSavedCardsForSocCode:(NSString *)socCode {
+//    NSDictionary *savedCards = [defaults objectForKey:@"savedCards"];
+//    NSMutableArray *savedCardsForSocCode = [savedCards objectForKey:socCode];
+//    NSMutableArray *unarchivedCards = [[NSMutableArray alloc] init];
+//    for (NSData *data in savedCardsForSocCode) {
+//        NSObject *card = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+//        [unarchivedCards addObject:card];
+//    }
+//    return unarchivedCards;
+//}
+
+
 @end
diff --git a/pinpoint2/next-qualification-card.html b/pinpoint2/next-qualification-card.html
new file mode 100644
index 0000000..b6cda05
--- /dev/null
+++ b/pinpoint2/next-qualification-card.html
@@ -0,0 +1,21 @@
+<div style="background:#fff; font-family:'helvetica neue', sans-serif;">
+    <h1>{{title}}</h1>
+    <h3>Annual pay</h3>
+    <ul>
+        {{#payBreakdown}}
+        <li>{{qualificationName}}: {{yearlyPay}}</li>
+        {{/payBreakdown}}
+    </ul>
+    <h3>Number of jobs this year</h3>
+    <ul>
+        {{#workingFuturesBreakdown}}
+        <li>{{qualificationName}}: {{numberOfJobsAvailable}}</li>
+        {{/workingFuturesBreakdown}}
+    </ul>
+    <h3>Percentage unemployment</h3>
+    <ul>
+        {{#unemploymentBreakdown}}
+        <li>{{qualificationName}}: {{unemploymentRate}}</li>
+        {{/unemploymentBreakdown}}
+    </ul>
+</div>
\ No newline at end of file
diff --git a/pinpoint2Tests/pinpoint2Tests.m b/pinpoint2Tests/pinpoint2Tests.m
index ad884af..4902911 100644
--- a/pinpoint2Tests/pinpoint2Tests.m
+++ b/pinpoint2Tests/pinpoint2Tests.m
@@ -42,11 +42,4 @@ - (void)testExample
     XCTAssertTrue([card isFinished], @"shouldn't be true");
 }
 
-- (void)testSavingCards {
-    PPCard *card = [[PPCard alloc] init];
-    [[PPUserPreferencesStore sharedInstance] saveCard:card forSocCode:@"2316"];
-    NSArray *arraySavedCards = [[PPUserPreferencesStore sharedInstance] getSavedCardsForSocCode:@"2316"];
-    XCTAssertEqual(arraySavedCards[0], card, @"not equal");
-}
-
 @end