diff --git a/src/components/forms/CourseForm.js b/src/components/forms/CourseForm.js
new file mode 100644
index 0000000..913235d
--- /dev/null
+++ b/src/components/forms/CourseForm.js
@@ -0,0 +1,58 @@
+import React from "react";
+import TextInput from "../common/TextInput";
+import PropTypes from "prop-types";
+
+function CourseForm(props) {
+  return (
+    <form onSubmit={props.onSubmit}>
+      <TextInput
+        id="title"
+        label="Title"
+        onChange={props.onChange}
+        name="title"
+        value={props.course.title}
+        error={props.errors.title}
+      />
+
+      <div className="form-group">
+        <label htmlFor="author">Author</label>
+        <div className="field">
+          <select
+            id="author"
+            name="authorId"
+            onChange={props.onChange}
+            value={props.course.authorId || ""}
+            className="form-control"
+          >
+            <option value="" />
+            <option value="1">Cory House</option>
+            <option value="2">Scott Allen</option>
+          </select>
+        </div>
+        {props.errors.authorId && (
+          <div className="alert alert-danger">{props.errors.authorId}</div>
+        )}
+      </div>
+
+      <TextInput
+        id="category"
+        label="Category"
+        onChange={props.onChange}
+        name="category"
+        value={props.course.category}
+        error={props.errors.category}
+      />
+
+      <input type="submit" value="Save" className="btn btn-primary" />
+    </form>
+  );
+}
+
+CourseForm.propTypes = {
+  course: PropTypes.object.isRequired,
+  onSubmit: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+  errors: PropTypes.object.isRequired,
+};
+
+export default CourseForm;
diff --git a/src/components/forms/UserForm.js b/src/components/forms/UserForm.js
new file mode 100644
index 0000000..6d25e92
--- /dev/null
+++ b/src/components/forms/UserForm.js
@@ -0,0 +1,29 @@
+import React from "react";
+import TextInput from "../common/TextInput";
+import PropTypes from "prop-types";
+
+function UserForm(props) {
+  return (
+    <form onSubmit={props.onSubmit}>
+      <TextInput
+        id="username"
+        label="Username"
+        onChange={props.onChange}
+        name="title"
+        value={props.user.username}
+        error={props.errors.title}
+      />
+      /* Add other form elements */
+      <input type="submit" value="Save" className="btn btn-primary" />
+    </form>
+  );
+}
+
+UserForm.propTypes = {
+  user: PropTypes.object.isRequired,
+  onSubmit: PropTypes.func.isRequired,
+  onChange: PropTypes.func.isRequired,
+  errors: PropTypes.object.isRequired,
+};
+
+export default UserForm;