diff --git a/Dockerfile b/Dockerfile
index d6f6ece..cb1b009 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
 FROM gcc:latest
 
+RUN g++ src/*.cpp -o Bowling
+
 WORKDIR /app
 
 COPY rolls.txt /app/
-COPY include/* /app/include/
-COPY src/* /app/src/
 
-RUN g++ src/*.cpp -o Bowling
+#RUN g++ src/*.cpp -o Bowling
 
 CMD ["./Bowling", "rolls.txt"]
diff --git a/include/FileUtil.h b/include/FileUtil.h
new file mode 100644
index 0000000..6fd990c
--- /dev/null
+++ b/include/FileUtil.h
@@ -0,0 +1,19 @@
+#ifndef FILEUTIL_H
+#define FILEUTIL_H
+
+#include <string>
+#include <vector>
+
+using namespace std;
+
+class FileUtil {
+    public:
+        FileUtil() = default;
+        
+        ~FileUtil() = default;
+        
+        static string getFile(char *path);
+        static bool fileExists(char *path);
+};
+
+#endif
\ No newline at end of file
diff --git a/include/Frame.h b/include/Frame.h
new file mode 100644
index 0000000..0ae8f34
--- /dev/null
+++ b/include/Frame.h
@@ -0,0 +1,11 @@
+#ifndef FRAME_H
+#define FRAME_H
+
+#include <vector>
+using namespace std;
+
+struct Frame {
+    vector<int> Roll;
+};
+
+#endif
\ No newline at end of file
diff --git a/include/NumberHelper.h b/include/NumberHelper.h
index daa95f9..eb2c7b1 100644
--- a/include/NumberHelper.h
+++ b/include/NumberHelper.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "../include/Frame.h"
 
 using namespace std;
 
@@ -14,6 +15,13 @@ class NumberHelper {
         
         static vector<int> getRolls(string csv);
         static bool validateRolls(vector<int> rolls);
+        static vector<Frame> createFrames(vector<int> rolls);
+    
+    private:
+        static Frame createStrikeFrame(int i);
+        static Frame createFreeFrame(int i, int j);
+        static Frame createBonusFrame(int i, int j, int k);
+        static bool isNumber(const std::string& str);
 };
 
 
diff --git a/include/PrintFrames.h b/include/PrintFrames.h
index d4b508d..782d82e 100644
--- a/include/PrintFrames.h
+++ b/include/PrintFrames.h
@@ -2,6 +2,8 @@
 #define PRINTFRAMES_H
 
 #include <vector>
+#include <string>
+#include "../include/Frame.h"
 
 using namespace std;
 
@@ -11,8 +13,9 @@ class PrintFrames {
         
         ~PrintFrames() = default;
         
-        static void printHeader(vector<int> rolls);
-        static void printValue(vector<int> rolls);
+        static void printHeader();
+        static void printValue(string values);
+        static string parseValue(vector<Frame> frames);
 };
 
 #endif
\ No newline at end of file
diff --git a/include/ScoreCalculator.h b/include/ScoreCalculator.h
index d38289e..724a60e 100644
--- a/include/ScoreCalculator.h
+++ b/include/ScoreCalculator.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "../include/Frame.h"
 
 using namespace std;
 
@@ -12,7 +13,7 @@ class ScoreCalculator {
         
         ~ScoreCalculator() = default;
         
-        static int getScore(vector<int> rolls);
+        static int getScore(vector<Frame> rolls);
 };
 
 #endif
\ No newline at end of file
diff --git a/rolls.txt b/rolls.txt
index 083bc71..aadbdc8 100644
--- a/rolls.txt
+++ b/rolls.txt
@@ -1 +1 @@
-2, 3, 5, 4, 9, 1, 2, 5, 3, 2, 4, 2, 3, 3, 4, 6, 10, 3, 2,
+2, 3, 5, 4, 9, 1, 2, 5, 3, 2, 4, 2, 3, 3, 4, 6, 10, 3, 2
diff --git a/rolls4.txt b/rolls4.txt
new file mode 100644
index 0000000..cd432e6
--- /dev/null
+++ b/rolls4.txt
@@ -0,0 +1 @@
+5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, 10, 10, 5, 5
diff --git a/rolls5.txt b/rolls5.txt
new file mode 100644
index 0000000..9a56ce2
--- /dev/null
+++ b/rolls5.txt
@@ -0,0 +1 @@
+5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 10, 10
diff --git a/src/FileUtil.cpp b/src/FileUtil.cpp
new file mode 100644
index 0000000..9d5278e
--- /dev/null
+++ b/src/FileUtil.cpp
@@ -0,0 +1,28 @@
+#include "../include/FileUtil.h"
+#include <string>
+#include <fstream>
+#include <sys/stat.h>
+
+bool FileUtil::fileExists(char *path){
+    struct stat s;
+    
+    // Check if file exists, and if it isn't a folder.
+    if (stat(path, &s) == 0 && !(s.st_mode & S_IFDIR)){
+        return true;
+    }
+    
+    return false;
+}
+
+string FileUtil::getFile(char *path){
+    ifstream file(path);
+    
+    string line;
+    
+    // There is only one line in the file
+    getline(file, line);
+    
+    file.close();
+    
+    return line;
+}
\ No newline at end of file
diff --git a/src/NumberHelper.cpp b/src/NumberHelper.cpp
index d13a7f5..4bb6b91 100644
--- a/src/NumberHelper.cpp
+++ b/src/NumberHelper.cpp
@@ -1,7 +1,9 @@
 #include "../include/NumberHelper.h"
+#include <iostream>
 #include <string>
 #include <sstream>
 #include <vector>
+#include <cctype>
 
 vector<int> NumberHelper::getRolls(string csv){
     vector<int> rolls;
@@ -10,6 +12,11 @@ vector<int> NumberHelper::getRolls(string csv){
     
     // Get number from the CSV file, split by comma, and convert to int.
     while (getline(ss, number, ',')) {
+        if (!isNumber(number)) {
+            cerr << number << " is not a number.";
+            break;
+        }
+        
         rolls.push_back(stoi(number));
     }
     
@@ -17,11 +24,122 @@ vector<int> NumberHelper::getRolls(string csv){
 }
 
 bool NumberHelper::validateRolls(vector<int> rolls){
-    for(int i = 0; i < rolls.size(); ++i) {
+    int rollCount = rolls.size();
+    
+    for(int i = 0; i < rollCount; ++i) {
         if(rolls[i] > 10 || rolls[i] < 0) {
+            cerr << "Number: " << rolls[i] << " is invalid.";
+            return false;
+        }
+    }
+    
+    // A game can not have less than 12 rolls, and more than 21.
+    if (rollCount < 12 || rollCount > 21) {
+        cerr << "Incorrect amount of rolls.";
+        return false;
+    }
+    
+    // 10th frame rule.
+    if (rollCount == 21) {
+        if (rolls[18] != 10 && rolls[18] + rolls[19] != 10) {
             return false;
         }
     }
     
+    return true;
+}
+
+vector<Frame> NumberHelper::createFrames(vector<int> rolls){
+    vector<Frame> frame;
+        
+    int roll = 0;
+    
+    while (roll != rolls.size())
+    {
+        // Strike
+        if (rolls[roll] == 10)
+        {
+            // If we're on our last frame, and roll a strike, we're given two bonus rolls.
+            if (roll + 3 == rolls.size() && rolls[roll - 3] == 10) {
+                frame.push_back(createBonusFrame(rolls[roll], rolls[roll + 1], rolls[roll + 2]));
+                break;
+            }
+            
+            frame.push_back(createStrikeFrame(10));
+            
+            roll += 1;
+        }
+        
+        // Spare
+        else if (rolls[roll] + rolls[roll + 1] == 10)
+        {
+            // If we're on our last frame, and roll a spare, we're given a bonus roll.
+            if (roll + 3 == rolls.size() && rolls[roll] + rolls[roll + 1] == 10)
+            {
+                frame.push_back(createBonusFrame(rolls[roll], rolls[roll + 1], rolls[roll + 2]));
+                break;
+            }
+            
+            frame.push_back(createFreeFrame(rolls[roll], rolls[roll + 1]));
+            
+            roll += 2;
+        }
+        
+        // Open Frame
+        else
+        {
+            frame.push_back(createFreeFrame(rolls[roll], rolls[roll + 1]));
+            
+            roll += 2;
+        }
+    }
+    
+    return frame;
+}
+
+Frame NumberHelper::createStrikeFrame(int i){
+    struct Frame frame = Frame();
+    
+    vector<int> rolls;
+    
+    rolls.push_back(i);
+    
+    frame.Roll = rolls;
+    
+    return frame;
+}
+
+Frame NumberHelper::createFreeFrame(int i, int j){
+    struct Frame frame = Frame();
+    
+    vector<int> rolls;
+    
+    rolls.push_back(i);
+    rolls.push_back(j);
+    
+    frame.Roll = rolls;
+    
+    return frame;
+}
+
+Frame NumberHelper::createBonusFrame(int i, int j, int k){
+    struct Frame frame = Frame();
+    
+    vector<int> rolls;
+    
+    rolls.push_back(i);
+    rolls.push_back(j);
+    rolls.push_back(k);
+    
+    frame.Roll = rolls;
+    
+    return frame;
+}
+
+bool NumberHelper::isNumber(const std::string& str){
+    for (size_t i = 0; i < str.size(); ++i) {
+        if (!isdigit(str[i]) && !isspace(str[i])) return false;
+    }
+    
     return true;
 }
\ No newline at end of file
diff --git a/src/PrintFrames.cpp b/src/PrintFrames.cpp
index 58edc9b..1630ef8 100644
--- a/src/PrintFrames.cpp
+++ b/src/PrintFrames.cpp
@@ -1,116 +1,138 @@
 #include "../include/PrintFrames.h"
 #include <iostream>
+#include <sstream>
 
-void PrintFrames::printHeader(vector<int> rolls){
-    int frame = 0;
-    int i = 1;
-    
-    while (true) {
-        cout << "|";
-        
-        // Strike
-        if (rolls[frame] == 10) {
-            // If we're on our last frame, and roll a strike, we're given two bonus rolls.
-            if (frame + 3 == rolls.size() && rolls[frame - 3] == 10) {
-                cout << " f" << i << "   |" << endl;
-                break;
-            }
-            
-            cout << " f" << i << " ";
-            frame += 1;
-        }
-        
-        // Spare
-        else if (rolls[frame] + rolls[frame + 1] == 10) {
-            // If we're on our last frame, and roll a spare, we're given a bonus roll.
-            if (frame + 3 == rolls.size() && rolls[frame] + rolls[frame + 1] == 10)
-            {
-                cout << " f" << i << "   |" << endl;
-                break;
-            }
-            
-            cout << " f" << i << " ";
-            frame += 2;
-        }
-        
-        // Open Frame
-        else {
-            cout << " f" << i << " ";
-            frame += 2;
-        }
-        
-        ++i;
-        
-        // No more frames
-        if (frame == rolls.size()) {
-            cout << "|" << endl;
-            break;
-        }
-    }
+void PrintFrames::printHeader() {
+    cout << "| f1 | f2 | f3 | f4 | f5 | f6 | f7 | f8 | f9 | f10   |" << endl;
 }
 
-void PrintFrames::printValue(vector<int> rolls){
-    int frame = 0;
+void PrintFrames::printValue(string value) {
+    cout << value;
+}
+
+string PrintFrames::parseValue(vector<Frame> frames) {
+    stringstream ss;
     
-    while (true) {
-        cout << "|";
-        
+    // There can only be 10 frames.
+    for (int i = 0; i < 10; i++) {
+        ss << "|";
         // Strike
-        if (rolls[frame] == 10) {
-            // If we're on our last frame, and roll a strike, we're given two bonus rolls.
-            if (frame + 3 == rolls.size() && rolls[frame - 3] == 10) {
-                if (rolls[frame + 1] == 10 && rolls[frame + 2] == 10) {
-                    cout << "X, X, X|" << endl;
+        if (frames[i].Roll[0] == 10) {
+            if (frames[i].Roll.size() == 3) {
+                ss << "X, ";
+                
+                if (frames[i].Roll[1] == 10 && frames[i].Roll[2] == 10) {
+                    ss << "X, X";
                 }
-                else if (rolls[frame + 1] == 0 && rolls[frame + 2] == 0) {
-                    cout << "X, -, -|" << endl;
+                else if (frames[i].Roll[1] != 10 && frames[i].Roll[2] == 10) {
+                    ss << frames[i].Roll[1] << ", X  ";
                 }
-                else if (rolls[frame + 1] == 0) {
-                    cout << "X, -, " << rolls[frame + 2] << "|" << endl;
-                }
-                else if (rolls[frame + 2] == 0) {
-                    cout << "X, " << rolls[frame + 1] << ", -|" << endl;
-                }
-                else {
-                    cout << "X, " << rolls[frame + 1] << ", " << rolls[frame + 2] << "|" << endl;
+                else if (frames[i].Roll[1] == 10 && frames[i].Roll[2] != 10) {
+                    ss << "X, " << frames[i].Roll[2] << "  ";
                 }
                 
-                break;
+                else if (frames[i].Roll[1] == 10 && frames[i].Roll[2] == 0) {
+                    ss << frames[i].Roll[1] << ", -  ";
+                }
+                else if (frames[i].Roll[1] == 0 && frames[i].Roll[2] == 10) {
+                    ss << "-, " << frames[i].Roll[2] << "  ";
+                }
+                
+                else if (frames[i].Roll[1] != 10 && frames[i].Roll[2] == 0) {
+                    ss << frames[i].Roll[1] << ", -  ";
+                }
+                else if (frames[i].Roll[1] == 0 && frames[i].Roll[2] != 10) {
+                    ss << "-, " << frames[i].Roll[2] << "  ";
+                }
+                
+                continue;
             }
             
-            cout << "X   ";
-            frame += 1;
+            // If the next frame has 3 or 2 rolls, then take those 2.
+            if (frames[i + 1].Roll.size() > 1) {
+                if (frames[i + 1].Roll[0] == 10 && frames[i + 1].Roll[1] != 10) {
+                    ss << "X, " << frames[i + 1].Roll[0] << "  ";
+                }
+                else if (frames[i + 1].Roll[0] != 10 && frames[i + 1].Roll[1] == 10) {
+                    ss << frames[i + 1].Roll[1] << ", X";
+                } else {
+                    if (frames[i + 1].Roll[0] + frames[i + 1].Roll[1] == 10) {
+                        ss << "X, " << frames[i + 1].Roll[0] << ", /";
+                    }
+                    
+                    else if (frames[i + 1].Roll[0] == 0 && frames[i + 1].Roll[1] != 0) {
+                        ss << "X, " << "-, " << frames[i + 1].Roll[1];
+                    }
+                    else if (frames[i + 1].Roll[0] != 0 && frames[i + 1].Roll[1] == 0) {
+                        ss << "X, " << frames[i + 1].Roll[0] << ", -";
+                    }
+                    
+                    else {
+                        ss << "X,  ";
+                    }
+                }
+                
+                continue;
+            }
+            
+            // Both next frames, that are not the last, are 10.
+            ss << "X   ";
+            
+            continue;
         }
         
         // Spare
-        else if (rolls[frame] + rolls[frame + 1] == 10) {
-            // If we're on our last frame, and roll a spare, we're given a bonus roll.
-            if (frame + 3 == rolls.size() && rolls[frame] + rolls[frame + 1] == 10)
-            {
-                cout << rolls[frame] << ", /" << ", " << rolls[frame + 1] << "|" << endl;
-                break;
+        if (frames[i].Roll[0] + frames[i].Roll[1] == 10) {
+            if (frames[i].Roll.size() == 3) {
+                if (frames[i].Roll[0] == 0 && frames[i].Roll[1] != 10  && frames[i].Roll[2] != 10) {
+                    if (frames[i].Roll[2] == 0) {
+                        ss << "-, /, -";
+                    } else {
+                        ss << "-, " << frames[i].Roll[1] << frames[i].Roll[2];
+                    }
+                }
+                else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] == 10 && frames[i].Roll[2] != 10) {
+                    if (frames[i].Roll[2] == 0) {
+                        ss << "-, /, -";
+                    } else {
+                        ss << "-, /, " << frames[i].Roll[2];
+                    }
+                }
+                else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] == 10 && frames[i].Roll[2] == 10) {
+                    ss << "-, /, X";
+                } else {
+                    ss << frames[i].Roll[0] << ", /, " << frames[i].Roll[2];
+                }
+                continue;
             }
             
-            cout << rolls[frame] << ", /";
-            frame += 2;
+            ss << frames[i].Roll[0] << ", /";
+            continue;
         }
         
-        // Open Frame
-        else {
-            if (rolls[frame] == 0) {
-                cout << "-" << ", " << rolls[frame + 1];
+        // Open frame
+        if (i == 9) {
+            ss << frames[i].Roll[0] << ", " << frames[i].Roll[1] << "   ";
+        } else {
+            if (frames[i].Roll[0] == 0 && frames[i].Roll[1] == 0) {
+                ss << "-, -";
             }
-            else if (rolls[frame + 1] == 0) {
-                cout << rolls[frame] << ", -";
+            else if (frames[i].Roll[0] == 0 && frames[i].Roll[1] != 0) {
+                ss << "-, " << frames[i].Roll[1];
             }
             
-            cout << "" << rolls[frame] << ", " << rolls[frame + 1];
-            frame += 2;
-        }
-        
-        if (frame == rolls.size()) {
-            cout << " |" << endl;
-            break;
+            else if (frames[i].Roll[0] != 0 && frames[i].Roll[1] == 0) {
+                ss << frames[i].Roll[0] << ", -";
+            }
+            
+            else {
+                ss << frames[i].Roll[0] << ", " << frames[i].Roll[1];
+            }
         }
     }
+    
+    ss << "|";
+    ss << endl;
+    
+    return ss.str();
 }
\ No newline at end of file
diff --git a/src/ScoreCalculator.cpp b/src/ScoreCalculator.cpp
index 5b5e147..d85529b 100644
--- a/src/ScoreCalculator.cpp
+++ b/src/ScoreCalculator.cpp
@@ -1,45 +1,42 @@
 #include "../include/ScoreCalculator.h"
+#include "../include/Frame.h"
 
-int ScoreCalculator::getScore(vector<int> rolls) {
+int ScoreCalculator::getScore(vector<Frame> frames) {
     int score = 0;
-    int frame = 0;
     
-    while (true) {
+    // There can only be 10 frames.
+    for (int i = 0; i < 10; i++) {
         // Strike
-        if (rolls[frame] == 10) {
-            // If we're on our last frame, and roll a strike, we're given two bonus rolls.
-            if (frame + 3 == rolls.size() && rolls[frame - 3] == 10) {
-                score += 10 + rolls[frame + 1] + rolls[frame + 2];
-                break;
+        if (frames[i].Roll[0] == 10) {
+            if (frames[i].Roll.size() == 3) {
+                score += frames[i].Roll[0] + frames[i].Roll[1] + frames[i].Roll[2];
+                continue;
             }
             
-            score += 10 + rolls[frame + 1] + rolls[frame + 2];
-            frame += 1;
+            // If the next frame has 3 or 2 rolls, then take those 2.
+            if (frames[i + 1].Roll.size() > 1) {
+                score += frames[i].Roll[0] + frames[i + 1].Roll[0] + frames[i + 1].Roll[1];
+                continue;
+            }
+            
+            // Both next frames, that are not the last, are 10.
+            score += frames[i].Roll[0] + frames[i + 1].Roll[0] + frames[i + 2].Roll[0];
+            continue;
         }
         
         // Spare
-        else if (rolls[frame] + rolls[frame + 1] == 10) {
-            // If we're on our last frame, and roll a spare, we're given a bonus roll.
-            if (frame + 3 == rolls.size() && rolls[frame] + rolls[frame + 1] == 10)
-            {
-                score += 10 + rolls[frame + 1];
-                break;
+        if (frames[i].Roll[0] + frames[i].Roll[1] == 10) {
+            if (frames[i].Roll.size() == 3) {
+                score += frames[i].Roll[0] + frames[i].Roll[1] + frames[i].Roll[2];
+                continue;
             }
             
-            score += 10 + rolls[frame + 2];
-            frame += 2;
+            score += 10 + frames[i + 1].Roll[0];
+            continue;
         }
         
-        // Open Frame
-        else {
-            score += rolls[frame] + rolls[frame + 1];
-            frame += 2;
-        }
-        
-        // No more frames
-        if (frame == rolls.size()) {
-            break;
-        }
+        // Open frame
+        score += frames[i].Roll[0] + frames[i].Roll[1];
     }
     
     return score;
diff --git a/src/main.cpp b/src/main.cpp
index edc4b39..9abb39a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,6 @@
 #include <iostream>
 #include <string>
-#include "../include/FileReader.h"
-#include "../include/FileHelper.h"
+#include "../include/FileUtil.h"
 #include "../include/NumberHelper.h"
 #include "../include/ScoreCalculator.h"
 #include "../include/PrintFrames.h"
@@ -14,23 +13,26 @@ int main(int argc, char *argv[]) {
         return 0;
     }
     
-    if (!FileHelper::fileExists(argv[1])) {
+    if (!FileUtil::fileExists(argv[1])) {
         cerr << "Filepath: " << argv[1] << " doesn't exist.";
         return 0;
     }
     
-    string file = FileReader::getFile(argv[1]);
+    string file = FileUtil::getFile(argv[1]);
     vector<int> rolls = NumberHelper::getRolls(file);
     
     if (!NumberHelper::validateRolls(rolls)) {
-        cerr << "Non-valid number in rolls.";
         return 0;
     }
     
-    PrintFrames::printHeader(rolls);
-    PrintFrames::printValue(rolls);
+    vector<Frame> frames = NumberHelper::createFrames(rolls);
     
-    int score = ScoreCalculator::getScore(rolls);
+    string values = PrintFrames::parseValue(frames);
+    
+    PrintFrames::printHeader();
+    PrintFrames::printValue(values);
+    
+    int score = ScoreCalculator::getScore(frames);
     cout << "Score: " << score << endl;
     
     return 0;