diff --git a/src/components/FinalPoem.js b/src/components/FinalPoem.js
index d516184e..c7a65bdd 100644
--- a/src/components/FinalPoem.js
+++ b/src/components/FinalPoem.js
@@ -1,20 +1,48 @@
-import React from 'react';
-import './FinalPoem.css';
+import React from "react";
+import "./FinalPoem.css";
+import PropTypes from "prop-types";
 
-const FinalPoem = (props) => {
+const FinalPoem = props => {
+  let contents = "";
 
-  return (
-    <div className="FinalPoem">
+  if (props.showFinalPoem) {
+    contents = (
       <section className="FinalPoem__poem">
         <h3>Final Poem</h3>
-
       </section>
-
+    );
+  } else {
+    contents = (
       <div className="FinalPoem__reveal-btn-container">
-        <input type="button" value="We are finished: Reveal the Poem" className="FinalPoem__reveal-btn" />
+        <input
+          type="button"
+          value="We are finished: Reveal the Poem"
+          className="FinalPoem__reveal-btn"
+          onClick={props.showFinalPoemCallback}
+        />
       </div>
+    );
+  }
+
+  let finalPoem = "";
+  if (props.showFinalPoem) {
+    finalPoem = props.lines.map((line, i) => {
+      return <p key={i}>{line}</p>;
+    });
+  }
+
+  return (
+    <div className="FinalPoem">
+      {contents}
+      {finalPoem}
     </div>
   );
-}
+};
+
+FinalPoem.propTypes = {
+  showFinalPoem: PropTypes.bool.isRequired,
+  showFinalPoemCallback: PropTypes.func.isRequired,
+  lines: PropTypes.array.isRequired
+};
 
 export default FinalPoem;
diff --git a/src/components/Game.js b/src/components/Game.js
index e99f985a..70471559 100644
--- a/src/components/Game.js
+++ b/src/components/Game.js
@@ -1,18 +1,36 @@
-import React, { Component } from 'react';
-import './Game.css';
-import PlayerSubmissionForm from './PlayerSubmissionForm';
-import FinalPoem from './FinalPoem';
-import RecentSubmission from './RecentSubmission';
+import React, { Component } from "react";
+import "./Game.css";
+import PlayerSubmissionForm from "./PlayerSubmissionForm";
+import FinalPoem from "./FinalPoem";
+import RecentSubmission from "./RecentSubmission";
 
 class Game extends Component {
-
   constructor(props) {
     super(props);
+
+    this.state = {
+      lines: [],
+      finalPoem: false
+    };
   }
 
-  render() {
+  addLine = newLine => {
+    const lines = this.state.lines;
+    lines.push(newLine);
+
+    this.setState({
+      lines
+    });
+  };
 
-    const exampleFormat = FIELDS.map((field) => {
+  revealPoem = () => {
+    this.setState({
+      finalPoem: true
+    });
+  };
+
+  render() {
+    const exampleFormat = FIELDS.map(field => {
       if (field.key) {
         return field.placeholder;
       } else {
@@ -20,24 +38,53 @@ class Game extends Component {
       }
     }).join(" ");
 
+    let recentSub = "";
+
+    if (this.state.lines.length > 0) {
+      recentSub = (
+        <RecentSubmission
+          recentSub={this.state.lines[this.state.lines.length - 1]}
+        />
+      );
+    }
+
+    let submissionForm = "";
+
+    if (!this.state.finalPoem) {
+      submissionForm = (
+        <div>
+          {recentSub}
+          <PlayerSubmissionForm
+            addPoemLineCallback={this.addLine}
+            fields={FIELDS}
+            playerNum={this.state.lines.length + 1}
+          />
+        </div>
+      );
+    }
     return (
       <div className="Game">
         <h2>Game</h2>
 
-        <p>Each player should take turns filling out and submitting the form below. Each turn should be done individually and <em>in secret!</em> Take inspiration from the revealed recent submission. When all players are finished, click the final button on the bottom to reveal the entire poem.</p>
-
-        <p>Please follow the following format for your poetry submission:</p>
-
-        <p className="Game__format-example">
-          { exampleFormat }
+        <p>
+          Each player should take turns filling out and submitting the form
+          below. Each turn should be done individually and <em>in secret!</em>{" "}
+          Take inspiration from the revealed recent submission. When all players
+          are finished, click the final button on the bottom to reveal the
+          entire poem.
         </p>
 
-        <RecentSubmission />
+        <p>Please follow the following format for your poetry submission:</p>
 
-        <PlayerSubmissionForm />
+        <p className="Game__format-example">{exampleFormat}</p>
 
-        <FinalPoem />
+        {submissionForm}
 
+        <FinalPoem
+          lines={this.state.lines}
+          showFinalPoem={this.state.finalPoem}
+          showFinalPoemCallback={this.revealPoem}
+        />
       </div>
     );
   }
@@ -46,31 +93,31 @@ class Game extends Component {
 const FIELDS = [
   "The",
   {
-    key: 'adj1',
-    placeholder: 'adjective',
+    key: "adj1",
+    placeholder: "adjective"
   },
   {
-    key: 'noun1',
-    placeholder: 'noun',
+    key: "noun1",
+    placeholder: "noun"
   },
   {
-    key: 'adv',
-    placeholder: 'adverb',
+    key: "adv",
+    placeholder: "adverb"
   },
   {
-    key: 'verb',
-    placeholder: 'verb',
+    key: "verb",
+    placeholder: "verb"
   },
   "the",
   {
-    key: 'adj2',
-    placeholder: 'adjective',
+    key: "adj2",
+    placeholder: "adjective"
   },
   {
-    key: 'noun2',
-    placeholder: 'noun',
+    key: "noun2",
+    placeholder: "noun"
   },
-  ".",
+  "."
 ];
 
 export default Game;
diff --git a/src/components/PlayerSubmissionForm.css b/src/components/PlayerSubmissionForm.css
index 7cded5d9..6d6f98eb 100644
--- a/src/components/PlayerSubmissionForm.css
+++ b/src/components/PlayerSubmissionForm.css
@@ -31,7 +31,7 @@
   background-color: tomato;
 }
 
-.PlayerSubmissionFormt__input--invalid {
+.PlayerSubmissionForm__input--invalid {
   background-color: #FFE9E9;
 }
 
diff --git a/src/components/PlayerSubmissionForm.js b/src/components/PlayerSubmissionForm.js
index 1de05095..e319e4c4 100644
--- a/src/components/PlayerSubmissionForm.js
+++ b/src/components/PlayerSubmissionForm.js
@@ -1,33 +1,162 @@
-import React, { Component } from 'react';
-import './PlayerSubmissionForm.css';
+import React, { Component } from "react";
+import "./PlayerSubmissionForm.css";
+import PropTypes from "prop-types";
 
 class PlayerSubmissionForm extends Component {
-
   constructor(props) {
     super(props);
+
+    const userInput = {};
+
+    props.fields.forEach(field => {
+      if (field.key) {
+        userInput[field.key] = "";
+      }
+    });
+
+    this.state = userInput;
   }
 
-  render() {
+  onFieldChange = event => {
+    const { name, value } = event.target;
+
+    const updatedState = {};
+    updatedState[name] = value;
+
+    this.setState(updatedState);
+  };
+
+  validString = value => {
+    return value !== "";
+  };
+
+  onFormSubmit = event => {
+    event.preventDefault();
+
+    let allValid = true;
+
+    Object.values(this.state).forEach(value => {
+      if (!this.validString(value)) {
+        allValid = false;
+      }
+    });
+
+    if (!allValid) {
+      return;
+    }
+
+    let newPoemLine = [];
+
+    this.props.fields.forEach(field => {
+      if (field.key) {
+        newPoemLine.push(this.state[field.key]);
+      } else {
+        newPoemLine.push(field);
+      }
+    });
+
+    newPoemLine = newPoemLine.join(" ");
 
+    const resetState = {};
+
+    this.props.fields.forEach(field => {
+      if (field.key) {
+        resetState[field.key] = "";
+      }
+    });
+
+    this.setState(resetState);
+
+    this.props.addPoemLineCallback(newPoemLine);
+  };
+
+  render() {
     return (
       <div className="PlayerSubmissionForm">
-        <h3>Player Submission Form for Player #{  }</h3>
-
-        <form className="PlayerSubmissionForm__form" >
+        <h3>Player Submission Form for Player #{this.props.playerNum}</h3>
 
+        <form
+          className="PlayerSubmissionForm__form"
+          onSubmit={this.onFormSubmit}
+        >
           <div className="PlayerSubmissionForm__poem-inputs">
-
-            {
-              // Put your form inputs here... We've put in one below as an example
-            }
+            The
             <input
-              placeholder="hm..."
-              type="text" />
-
+              name="adj1"
+              value={this.state.adj1}
+              onChange={this.onFieldChange}
+              placeholder="adjective"
+              className={
+                this.validString(this.state.adj1)
+                  ? ""
+                  : "PlayerSubmissionForm__input--invalid"
+              }
+            />
+            <input
+              name="noun1"
+              value={this.state.noun1}
+              onChange={this.onFieldChange}
+              placeholder="noun"
+              className={
+                this.validString(this.state.noun1)
+                  ? ""
+                  : "PlayerSubmissionForm__input--invalid"
+              }
+            />
+            <input
+              name="adv"
+              value={this.state.adv}
+              onChange={this.onFieldChange}
+              placeholder="adverb"
+              className={
+                this.validString(this.state.adv)
+                  ? ""
+                  : "PlayerSubmissionForm__input--invalid"
+              }
+            />
+            <input
+              name="verb"
+              value={this.state.verb}
+              onChange={this.onFieldChange}
+              placeholder="verb"
+              className={
+                this.validString(this.state.verb)
+                  ? ""
+                  : "PlayerSubmissionForm__input--invalid"
+              }
+            />
+            the
+            <input
+              name="adj2"
+              value={this.state.adj2}
+              onChange={this.onFieldChange}
+              placeholder="adjective"
+              className={
+                this.validString(this.state.adj2)
+                  ? ""
+                  : "PlayerSubmissionForm__input--invalid"
+              }
+            />
+            <input
+              name="noun2"
+              value={this.state.noun2}
+              onChange={this.onFieldChange}
+              placeholder="noun"
+              className={
+                this.validString(this.state.noun2)
+                  ? ""
+                  : "PlayerSubmissionForm__input--invalid"
+              }
+            />
+            .
           </div>
 
           <div className="PlayerSubmissionForm__submit">
-            <input type="submit" value="Submit Line" className="PlayerSubmissionForm__submit-btn" />
+            <input
+              type="submit"
+              value="Submit Line"
+              className="PlayerSubmissionForm__submit-btn"
+            />
           </div>
         </form>
       </div>
@@ -35,4 +164,10 @@ class PlayerSubmissionForm extends Component {
   }
 }
 
+PlayerSubmissionForm.propTypes = {
+  addPoemLineCallback: PropTypes.func.isRequired,
+  fields: PropTypes.array.isRequired,
+  playerNum: PropTypes.number.isRequired
+};
+
 export default PlayerSubmissionForm;
diff --git a/src/components/RecentSubmission.js b/src/components/RecentSubmission.js
index 663da34b..34e301eb 100644
--- a/src/components/RecentSubmission.js
+++ b/src/components/RecentSubmission.js
@@ -1,13 +1,18 @@
-import React from 'react';
-import './RecentSubmission.css';
+import React from "react";
+import "./RecentSubmission.css";
+import PropTypes from "prop-types";
 
-const RecentSubmission = (props) => {
+const RecentSubmission = props => {
   return (
     <div className="RecentSubmission">
       <h3>The Most Recent Submission</h3>
-      <p className="RecentSubmission__submission">{  }</p>
+      <p className="RecentSubmission__submission">{props.recentSub}</p>
     </div>
   );
-}
+};
+
+RecentSubmission.propTypes = {
+  recentSub: PropTypes.string.isRequired
+};
 
 export default RecentSubmission;