diff --git a/SoundboardQuiz.xcodeproj/project.pbxproj b/SoundboardQuiz.xcodeproj/project.pbxproj
index 58aaa2a..1d129ee 100644
--- a/SoundboardQuiz.xcodeproj/project.pbxproj
+++ b/SoundboardQuiz.xcodeproj/project.pbxproj
@@ -26,6 +26,7 @@
 		2A9093D329F72D3D002DBA4F /* ImageCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9093D229F72D3D002DBA4F /* ImageCollectionView.swift */; };
 		2A9093D529F72D49002DBA4F /* SoundCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9093D429F72D49002DBA4F /* SoundCollectionView.swift */; };
 		2A9093D729F73564002DBA4F /* MainGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9093D629F73564002DBA4F /* MainGameViewController.swift */; };
+		2A9F5AB12A02BF0700EA876A /* Sound.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9F5AB02A02BF0700EA876A /* Sound.swift */; };
 		2AC1DDC129F6D292001253C3 /* SoundCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC1DDC029F6D292001253C3 /* SoundCollectionViewCell.swift */; };
 		2AC1DDC329F6D2A8001253C3 /* ImageCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC1DDC229F6D2A8001253C3 /* ImageCollectionViewCell.swift */; };
 		2AC1DDC929F6E1A2001253C3 /* TestTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC1DDC829F6E1A2001253C3 /* TestTableViewCell.swift */; };
@@ -71,6 +72,7 @@
 		2A9093D229F72D3D002DBA4F /* ImageCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ImageCollectionView.swift; path = SoundboardQuiz/ImageCollectionView.swift; sourceTree = "<group>"; };
 		2A9093D429F72D49002DBA4F /* SoundCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SoundCollectionView.swift; path = SoundboardQuiz/SoundCollectionView.swift; sourceTree = "<group>"; };
 		2A9093D629F73564002DBA4F /* MainGameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MainGameViewController.swift; path = SoundboardQuiz/MainGameViewController.swift; sourceTree = "<group>"; };
+		2A9F5AB02A02BF0700EA876A /* Sound.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Sound.swift; path = SoundboardQuiz/Sound.swift; sourceTree = "<group>"; };
 		2AC1DDC029F6D292001253C3 /* SoundCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SoundCollectionViewCell.swift; path = SoundboardQuiz/SoundCollectionViewCell.swift; sourceTree = "<group>"; };
 		2AC1DDC229F6D2A8001253C3 /* ImageCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ImageCollectionViewCell.swift; path = SoundboardQuiz/ImageCollectionViewCell.swift; sourceTree = "<group>"; };
 		2AC1DDC829F6E1A2001253C3 /* TestTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestTableViewCell.swift; sourceTree = "<group>"; };
@@ -108,6 +110,7 @@
 		2A0ACEE629F19CE7001E5D03 = {
 			isa = PBXGroup;
 			children = (
+				2A9F5AB02A02BF0700EA876A /* Sound.swift */,
 				2AEE28262A001CA800DEFFAC /* Sounds */,
 				2AC1DDC829F6E1A2001253C3 /* TestTableViewCell.swift */,
 				2A0ACF0A29F1A02E001E5D03 /* AppDelegate.swift */,
@@ -266,6 +269,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2A9093D729F73564002DBA4F /* MainGameViewController.swift in Sources */,
+				2A9F5AB12A02BF0700EA876A /* Sound.swift in Sources */,
 				2A0ACF1E29F1A02F001E5D03 /* CategoryTableViewCell.swift in Sources */,
 				2A0ACF2329F1A02F001E5D03 /* SceneDelegate.swift in Sources */,
 				2A2B750F29F2F0130089DE69 /* SquareCollectionViewController.swift in Sources */,
diff --git a/SoundboardQuiz/AppDelegate.swift b/SoundboardQuiz/AppDelegate.swift
index b0d7f38..76391c9 100644
--- a/SoundboardQuiz/AppDelegate.swift
+++ b/SoundboardQuiz/AppDelegate.swift
@@ -44,7 +44,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     // MARK: - Core Data stack
 
-    lazy var persistentContainer: NSPersistentContainer = {
+    public lazy var persistentContainer: NSPersistentContainer = {
         /*
          The persistent container for the application. This implementation
          creates and returns a container, having loaded the store for the
@@ -161,6 +161,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             }
         }
     }
+    
+//    func applicationDidEnterBackground(_ application: UIApplication) {
+//        
+//    }
+    func applicationWillTerminate(_ application: UIApplication) {
+        do{
+            try MainGameViewController.attemptSaveState()
+        } catch{
+            print(error.localizedDescription)
+            // We are not currently in the middle of a game, so we can safely exit
+            UserDefaults.standard.removeObject(forKey: "lastState")
+        }
+        
+    }
 
 
 
diff --git a/SoundboardQuiz/Base.lproj/Main.storyboard b/SoundboardQuiz/Base.lproj/Main.storyboard
index 442f8a1..4b61b17 100644
--- a/SoundboardQuiz/Base.lproj/Main.storyboard
+++ b/SoundboardQuiz/Base.lproj/Main.storyboard
@@ -41,15 +41,15 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="t26-Si-8kE">
-                                <rect key="frame" x="-11" y="164" width="393" height="641"/>
+                                <rect key="frame" x="-12" y="163" width="394" height="641"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="categoryCell" id="N0p-1K-NE1" customClass="CategoryCellTableViewCell" customModule="SoundboardQuiz" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="50" width="393" height="43.666667938232422"/>
+                                        <rect key="frame" x="0.0" y="50" width="394" height="43.666667938232422"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="N0p-1K-NE1" id="Y9C-qI-fgd">
-                                            <rect key="frame" x="0.0" y="0.0" width="393" height="43.666667938232422"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="394" height="43.666667938232422"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3NR-GS-yw4">
@@ -120,13 +120,13 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VUY-3M-0xL">
-                                <rect key="frame" x="56" y="354.66666666666669" width="280" height="95.666666666666686"/>
+                                <rect key="frame" x="56" y="354.66666666666669" width="280" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="280" id="LAm-eY-bzi"/>
                                 </constraints>
                                 <color key="tintColor" systemColor="systemRedColor"/>
                                 <state key="normal" title="Button"/>
-                                <buttonConfiguration key="configuration" style="filled" title="Resume (TODO)" cornerStyle="dynamic">
+                                <buttonConfiguration key="configuration" style="filled" title="Resume" cornerStyle="dynamic">
                                     <backgroundConfiguration key="background" cornerRadius="13" imageContentMode="left">
                                         <color key="backgroundColor" systemColor="systemRedColor"/>
                                         <imageReference key="image" image="arrow.forward" catalog="system" symbolScale="large" renderingMode="original" variableValue="1"/>
@@ -134,9 +134,12 @@
                                     <fontDescription key="titleFontDescription" type="system" pointSize="40"/>
                                     <directionalEdgeInsets key="contentInsets" top="0.0" leading="30" bottom="0.0" trailing="10"/>
                                 </buttonConfiguration>
+                                <connections>
+                                    <segue destination="tXV-QY-UTS" kind="show" identifier="directGameViewSegue" id="WQn-BQ-bGV"/>
+                                </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2We-Bk-sxh">
-                                <rect key="frame" x="56" y="727.33333333333337" width="280" height="48"/>
+                                <rect key="frame" x="56" y="658.66666666666663" width="280" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="280" id="rhm-w8-BaR"/>
                                 </constraints>
@@ -157,7 +160,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZMn-IS-d62">
-                                <rect key="frame" x="56" y="548.33333333333337" width="280" height="51.333333333333371"/>
+                                <rect key="frame" x="56" y="490.99999999999994" width="280" height="51.333333333333314"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="280" id="Fbp-bM-DPN"/>
                                 </constraints>
@@ -238,11 +241,13 @@
                             <outlet property="delegate" destination="BBh-RV-B99" id="uPL-6W-6Ob"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" id="Vzd-VX-nCI"/>
+                    <navigationItem key="navigationItem" id="Vzd-VX-nCI">
+                        <barButtonItem key="backBarButtonItem" title="Exit" id="fs4-fn-5YZ"/>
+                    </navigationItem>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="J2l-7l-fcn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2061.8320610687024" y="29.577464788732396"/>
+            <point key="canvasLocation" x="2905" y="-347"/>
         </scene>
         <!--High Scores View Controller-->
         <scene sceneID="co0-ym-JTk">
@@ -636,6 +641,9 @@
             <point key="canvasLocation" x="4737" y="-487"/>
         </scene>
     </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="WQn-BQ-bGV"/>
+    </inferredMetricsTieBreakers>
     <resources>
         <image name="arrow.forward" catalog="system" width="128" height="95"/>
         <image name="play.fill" catalog="system" width="117" height="128"/>
diff --git a/SoundboardQuiz/GameOverViewController.swift b/SoundboardQuiz/GameOverViewController.swift
index f380611..5dda1c4 100644
--- a/SoundboardQuiz/GameOverViewController.swift
+++ b/SoundboardQuiz/GameOverViewController.swift
@@ -28,6 +28,7 @@ class GameOverViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationItem.hidesBackButton = true
+        UserDefaults.standard.removeObject(forKey: "lastState")
         if let score, let categoryName {
             scoreLabel.text = "Score: \(score)"
             let defaults = UserDefaults.standard
diff --git a/SoundboardQuiz/HighScoresViewController.swift b/SoundboardQuiz/HighScoresViewController.swift
index d6887e6..e6c20e8 100644
--- a/SoundboardQuiz/HighScoresViewController.swift
+++ b/SoundboardQuiz/HighScoresViewController.swift
@@ -20,6 +20,7 @@ class HighScoresViewController: UIViewController {
     override func viewDidLoad() {
         scoreArray = [score1, score2, score3, score4, score5]
         super.viewDidLoad()
+        print("Entered High Scores View Controller")
       //  let defaults = UserDefaults.standard
         //let highScoresArr: Array<(String, Int)>? = defaults.array(forKey: "highScores") as? Array<(String, Int)>
         let fetchedData = UserDefaults.standard.data(forKey: "highScores")!
diff --git a/SoundboardQuiz/Info.plist b/SoundboardQuiz/Info.plist
index dd3c9af..8697d88 100644
--- a/SoundboardQuiz/Info.plist
+++ b/SoundboardQuiz/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UIApplicationExitsOnSuspend</key>
+	<true/>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
diff --git a/SoundboardQuiz/MainGameViewController.swift b/SoundboardQuiz/MainGameViewController.swift
index 480fa44..b9c28d9 100644
--- a/SoundboardQuiz/MainGameViewController.swift
+++ b/SoundboardQuiz/MainGameViewController.swift
@@ -9,13 +9,15 @@ import UIKit
 
 class MainGameViewController: UIViewController {
     //    @IBOutlet var titleBar: UINavigationItem!
-    
+    private static var currentInstance: MainGameViewController?
     private var embeddedViewController1: SquareCollectionViewController!
     private var embeddedViewController2: SquareCollectionViewController!
     
     @IBOutlet var scoreLabel: UILabel!
-
-
+    
+    public var isResuming: Bool = false
+    //private var secretIsResuming: Bool = false
+    
     @IBOutlet var containerView1: UIView!
     @IBOutlet var containerView2: UIView!
     var score = 0
@@ -29,7 +31,7 @@ class MainGameViewController: UIViewController {
     }
     
     func shuffle(itemCount: Int){
-
+        
         
         if let sub = sounds?.shuffled() {
             var slice = Array(sub[0..<min(itemCount, sub.endIndex)])
@@ -44,16 +46,16 @@ class MainGameViewController: UIViewController {
         }
         subSounds = subSounds?.shuffled()
         
-
-
+        
+        
     }
     func addSoundItems(_ numItems: Int){
         
-//        for aSound in subSounds!{
-//            print(aSound.name!, terminator: ", ")
-//        }
-//        print()
-
+        //        for aSound in subSounds!{
+        //            print(aSound.name!, terminator: ", ")
+        //        }
+        //        print()
+        
         if let sub = sounds?.shuffled() {
             var slice = Array(sub[0..<min(numItems, sub.endIndex)])
             while (slice.count < numItems) {
@@ -64,34 +66,34 @@ class MainGameViewController: UIViewController {
             print("error")
             return
         }
-
+        
         embeddedViewController1.reloadFromParentController()
         embeddedViewController2.reloadFromParentController()
     }
-//    @IBAction func doAnimateNewItems(_ sender: Any) {
-//
-//        //shuffle(itemCount: 8)
-//        addSoundItems(4)
-//
-//        if var subSounds {
-//            subSounds = Array(subSounds[4..<min(8, subSounds.endIndex)])
-//            self.subSounds = subSounds
-//            print("subsounds shrunk")
-//        }else{
-//            print("ERROR: subsounds not shrunk")
-//        }
-//        // do animate here
-//        embeddedViewController1.disableUserInteractionAndAnimate()
-//        embeddedViewController2.disableUserInteractionAndAnimate()
-//
-//
-//    }
+    //    @IBAction func doAnimateNewItems(_ sender: Any) {
+    //
+    //        //shuffle(itemCount: 8)
+    //        addSoundItems(4)
+    //
+    //        if var subSounds {
+    //            subSounds = Array(subSounds[4..<min(8, subSounds.endIndex)])
+    //            self.subSounds = subSounds
+    //            print("subsounds shrunk")
+    //        }else{
+    //            print("ERROR: subsounds not shrunk")
+    //        }
+    //        // do animate here
+    //        embeddedViewController1.disableUserInteractionAndAnimate()
+    //        embeddedViewController2.disableUserInteractionAndAnimate()
+    //
+    //
+    //    }
     
     func animate() {
         
         //shuffle(itemCount: 8)
         addSoundItems(4)
-
+        
         if var subSounds {
             subSounds = Array(subSounds[4..<min(8, subSounds.endIndex)])
             self.subSounds = subSounds
@@ -106,7 +108,7 @@ class MainGameViewController: UIViewController {
             self.embeddedViewController2.disableUserInteractionAndAnimate()
             
         }
-
+        
         
         
     }
@@ -124,20 +126,30 @@ class MainGameViewController: UIViewController {
     
     @IBOutlet var numShufflesLeftLabel: UILabel!
     public var numShufflesLeft = 5
-    
+    override func loadView() {
+        print("HELLO???????")
+        if(isResuming){
+            try! self.restoreState()
+            isResuming = false
+        }
+        super.loadView()
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        MainGameViewController.currentInstance = self
         self.title = categoryName
         scoreLabel.text = "Score: \(score)"
         numShufflesLeftLabel.text = "(\(numShufflesLeft > 0 ? numShufflesLeft : 0) Left)"
-
+        shuffleView.numShufflesLeft = self.numShufflesLeft
+        
         //do{
-            //try subSounds = sounds?.sorted(by: {(firstSound, secondSound) throws -> Bool in return firstSound.name ?? "" > secondSound.name ?? ""})
-
-
-       // }
-       // catch{ print(error.localizedDescription)}
-
+        //try subSounds = sounds?.sorted(by: {(firstSound, secondSound) throws -> Bool in return firstSound.name ?? "" > secondSound.name ?? ""})
+        
+        
+        // }
+        // catch{ print(error.localizedDescription)}
+        
         // Do any additional setup after loading the view.
     }
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -145,7 +157,7 @@ class MainGameViewController: UIViewController {
         shuffle(itemCount: 4)
         
         if let vc = segue.destination as? SquareCollectionViewController,
-                    segue.identifier == "soundViewSegue" {
+           segue.identifier == "soundViewSegue" {
             self.embeddedViewController1 = vc
         }else if let vc = segue.destination as? SquareCollectionViewController, segue.identifier == "imageViewSegue" {
             self.embeddedViewController2 = vc
@@ -156,7 +168,7 @@ class MainGameViewController: UIViewController {
             }
         }
     }
-
+    
     @IBOutlet var shuffleView: ShuffleView!
     
     func stopDragAndGreyOutSoundCell(name: String){
@@ -175,7 +187,7 @@ class MainGameViewController: UIViewController {
         
         if(numShufflesLeft > 0){
             embeddedViewController1.stopSound(forName: nil)
-
+            
             shuffle(itemCount: 4)
             numShufflesLeft -= 1
             
@@ -191,17 +203,74 @@ class MainGameViewController: UIViewController {
             numShufflesLeft -= 1
             shuffleView.backgroundColor = UIColor.systemGray
         }
+        shuffleView.numShufflesLeft = self.numShufflesLeft
+
     }
     
     /*
-    // MARK: - Navigation
+     // MARK: - Navigation
+     
+     // In a storyboard-based application, you will often want to do a little preparation before navigation
+     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+     // Get the new view controller using segue.destination.
+     // Pass the selected object to the new view controller.
+     }
+     */
+    public static func attemptSaveState() throws {
+        print("ATTEMPTING TO SAVE STATE!")
+        if let currentInstance{
+            print("INSTANCE FOUND!")
+            let possibleData = currentInstance.saveState()
+            let defaults = UserDefaults.standard
+            do{
+                let encodedState = try PropertyListEncoder().encode(possibleData)
+                defaults.set(encodedState, forKey: "lastState")
+                print("STATE SAVED!")
+            }
+            catch{
+                print(String(describing: error))
+            }
 
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
+            //save the data
+            
+        }else{
+            throw CocoaError(.coderInvalidValue)
+        }
+    }
+    private func saveState() -> MainGameData {
+        var data = MainGameData()
+        data.score = self.score
+        data.categoryName = self.categoryName
+        data.sounds = self.sounds
+        data.subSounds = self.subSounds
+        return data
+    }
+    
+    private func restoreState() throws {
+    //    @UIKit.Environment(\.managedObjectContext) var moc
+        
+        print("RESTORING STATE!")
+        let fetchedData = UserDefaults.standard.data(forKey: "lastState")
+        if let fetchedData{
+            let decoder = PropertyListDecoder()
+            decoder.userInfo[CodingUserInfoKey.managedObjectContext] = (UIApplication.shared.delegate as! AppDelegate).persistentContainer.viewContext
+            let mainGameData = try? decoder.decode(MainGameData.self, from: fetchedData)
+            if(mainGameData == nil){
+                print("ERROR: MainGameData is nil!")
+//                throw fatalError("MainGameData was nil, we should have never allowed to resume to happen.")
+            }
+//            self.score = mainGameData.score
+//            self.categoryName = mainGameData.categoryName
+//            self.sounds = mainGameData.sounds
+//            self.subSounds = mainGameData.subSounds
+            
+             self.score = mainGameData?.score ?? 0
+             self.categoryName = mainGameData?.categoryName
+             self.sounds = mainGameData?.sounds
+             self.subSounds = mainGameData?.subSounds
+             
+        }
     }
-    */
 
 }
 
@@ -210,3 +279,42 @@ protocol ClickableCell {
     //DO STUFF HERE TO GREY OUT CELL ETC.
 
 }
+
+struct MainGameData: Codable{
+    var score: Int = 0
+    var categoryName: String?
+    var sounds: Set<Sound>?
+    var subSounds: [Sound]?
+    
+//    enum CodingKeys: String, CodingKey {
+//        case score
+//        case categoryName
+//        case sounds
+//        case subSounds
+//    }
+}
+//extension MainGameData: Encodable {
+//  func encode(to encoder: Encoder) throws {
+//    var container = encoder.container(keyedBy: CodingKeys.self)
+//    try container.encode(score, forKey: .score)
+//    try container.encode(categoryName, forKey: .categoryName)
+//    try container.encode(movieDetails.language, forKey: .language)
+//    try container.encode(movieDetails.genre, forKey: .genre)
+//    try container.encode(movieDetails.releaseDate, forKey: .releaseDate)
+//    try container.encode(movieDetails.bannerImageUrl, forKey:  .bannerUrl)
+//  }
+//}
+//extension MainGameData: Decodable {
+//  init(from decoder: Decoder) throws {
+//
+//     var container = try decoder.container(keyedBy: CodingKeys.self)
+//     movieId = try container.decode(Int.self, forKey: .movieId)
+//
+//     name = try container.decode(String.self, forKey: .name)
+//     let language = try container.decode(String.self, forKey: .language)
+//     let genre = try container.decode(String.self, forKey: .genre)
+//     let releaseDate = try container.decode(String.self, forKey: .releaseDate)
+//     let bannerUrl = try container.decode(String.self, forKey: .bannerUrl)
+//     movieDetails =  MovieDetail(language: language, genre: genre, releaseDate: releaseDate, bannerImageUrl: bannerUrl)
+//    }
+//}
diff --git a/SoundboardQuiz/Model.xcdatamodeld/Model.xcdatamodel/contents b/SoundboardQuiz/Model.xcdatamodeld/Model.xcdatamodel/contents
index 4325e61..c7cec5c 100644
--- a/SoundboardQuiz/Model.xcdatamodeld/Model.xcdatamodel/contents
+++ b/SoundboardQuiz/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21513" systemVersion="21G531" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
-    <entity name="Sound" representedClassName="Sound" syncable="YES" codeGenerationType="class">
+    <entity name="Sound" representedClassName=".Sound" syncable="YES" codeGenerationType="category">
         <attribute name="file" optional="YES" attributeType="String"/>
         <attribute name="imageFile" optional="YES" attributeType="String"/>
         <attribute name="name" attributeType="String"/>
         <relationship name="parentCategory" maxCount="1" deletionRule="Nullify" destinationEntity="SoundCategory" inverseName="sounds" inverseEntity="SoundCategory"/>
     </entity>
-    <entity name="SoundCategory" representedClassName="SoundCategory" syncable="YES" codeGenerationType="class">
+    <entity name="SoundCategory" representedClassName=".SoundCategory" syncable="YES" codeGenerationType="class">
         <attribute name="name" optional="YES" attributeType="String"/>
         <relationship name="sounds" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Sound" inverseName="parentCategory" inverseEntity="Sound"/>
     </entity>
diff --git a/SoundboardQuiz/ShuffleView.swift b/SoundboardQuiz/ShuffleView.swift
index 1fbbafa..902fd03 100644
--- a/SoundboardQuiz/ShuffleView.swift
+++ b/SoundboardQuiz/ShuffleView.swift
@@ -14,10 +14,19 @@ class ShuffleView: UIView {
     required init?(coder: NSCoder) {
         super.init(coder: coder)
         self.accessibilityTraits = UIAccessibilityTraits.button
-
-        //TODO: Add voiceover support for shuffle button number of shuffles left and fix green sound buttons to read out the number of plays left from their accessible sub-labels
-        // TODO: Announce to accessibility users before the sound starts playing that there are X plays left (even if there are 0!)
-        
+        self.accessibilityLabel = "Shuffle"
+        self.accessibilityValue = "\(secretNumShufflesLeft) Shuffles Left"
+    }
+    private var secretNumShufflesLeft = 0
+    public var numShufflesLeft: Int {
+        set{
+            secretNumShufflesLeft = newValue
+            self.accessibilityValue = "\(secretNumShufflesLeft) Shuffles Left"
+        }
+        get{
+            return secretNumShufflesLeft
+        }
+    
     }
     /*
     // Only override draw() if you perform custom drawing.
diff --git a/SoundboardQuiz/Sound.swift b/SoundboardQuiz/Sound.swift
new file mode 100644
index 0000000..9633023
--- /dev/null
+++ b/SoundboardQuiz/Sound.swift
@@ -0,0 +1,40 @@
+//
+//  Sound.swift
+//  SoundboardQuiz
+//
+//  Created by Luke A Aschenbrenner on 5/3/23.
+//
+
+import Foundation
+import CoreData
+
+enum DecoderConfigurationError: Error {
+  case missingManagedObjectContext
+}
+public class Sound: NSManagedObject, Codable{
+
+    enum CodingKeys: CodingKey {
+        case file, name
+    }
+    required convenience public init(from decoder: Decoder) throws {
+        guard let context = decoder.userInfo[CodingUserInfoKey.managedObjectContext] as? NSManagedObjectContext else {
+          throw DecoderConfigurationError.missingManagedObjectContext
+        }
+
+        self.init(context: context)
+
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.file = try container.decode(String.self, forKey: .file)
+        self.name = try container.decode(String.self, forKey: .name)
+//        self.completions = try container.decode(Set<Sound>.self, forKey: .completions) as NSSet
+    }
+    public func encode(to encoder: Encoder) throws {
+      var container = encoder.container(keyedBy: CodingKeys.self)
+      try container.encode(file, forKey: .file)
+        try container.encode(name, forKey: .name)
+      //try container.encode(completions as! Set<ToddoCompletion>, forKey: .completions)
+    }
+}
+extension CodingUserInfoKey {
+  static let managedObjectContext = CodingUserInfoKey(rawValue: "managedObjectContext")!
+}
diff --git a/SoundboardQuiz/SoundCollectionViewCell.swift b/SoundboardQuiz/SoundCollectionViewCell.swift
index 1a2d585..4bb856c 100644
--- a/SoundboardQuiz/SoundCollectionViewCell.swift
+++ b/SoundboardQuiz/SoundCollectionViewCell.swift
@@ -69,7 +69,6 @@ class SoundCollectionViewCell: UICollectionViewCell {
             }
             label.text = "\(secretCellPlaysLeft)"
         }
-        // TODO: add voiceover to say exactly how many left
         UIAccessibility.post(notification: .announcement, argument: "You have \(secretCellPlaysLeft) plays left for this sound box.")
 
 
@@ -86,7 +85,7 @@ class SoundCollectionViewCell: UICollectionViewCell {
         self.isAccessibilityElement = true
         self.accessibilityTraits = .none
         self.accessibilityLabel = "Sound Box"
-        self.accessibilityValue = "label.accessibilityActivate()"
+        self.accessibilityValue = "\(cellPlaysLeft) Plays Remaining."
 
     }
         //        SoundCollectionViewCell.lastNum = ((SoundCollectionViewCell.lastNum + 1) % Int.max)
diff --git a/SoundboardQuiz/ViewController.swift b/SoundboardQuiz/ViewController.swift
index 4cf850e..481255a 100644
--- a/SoundboardQuiz/ViewController.swift
+++ b/SoundboardQuiz/ViewController.swift
@@ -13,7 +13,37 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
     }
+    //performSegue(withIdentifier: "segueGameOver", sender: self)
+//    @IBAction func resumePressed(_ sender: Any) {
+//        if self.shouldPerformSegue(withIdentifier: <#T##String#>, sender: <#T##Any?#>){}
+//        self.performSegue(withIdentifier: "segueDirectlyToGame", sender: self)
+//    }
+    
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        if let vc = segue.destination as? MainGameViewController{
+            if(UserDefaults.standard.data(forKey: "lastState") != nil){
+                print("NOW RESUMING MAIN GAME")
+                vc.isResuming = true
+            }
 
-
+//            if let categoryName, let sounds{
+//                vc.setInfo(categoryName: categoryName, sounds: (sounds as NSSet), score: score)
+//            }
+        }
+    }
+    override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
+        if(identifier == "directGameViewSegue"){
+            if(UserDefaults.standard.data(forKey: "lastState") != nil){
+                print("NOW RESUMING MAIN GAME")
+                return true
+            }else{
+                let uialert = UIAlertController(title: "No Resumable Session", message: "Sorry, there is no game to resume at this time.", preferredStyle: UIAlertController.Style.alert)
+                   uialert.addAction(UIAlertAction(title: "Okay", style: UIAlertAction.Style.default, handler: nil))
+                self.present(uialert, animated: true, completion: nil)
+                return false
+            }
+        }
+        return true
+    }
 }