diff --git a/lib/API.ts b/lib/API.ts
index 5f9c10eb..2e11d86e 100644
--- a/lib/API.ts
+++ b/lib/API.ts
@@ -215,7 +215,7 @@ export namespace API {
 
       let obj = await db.findObject(collection, query);
       if (!obj) {
-        obj = {};
+        obj = false;
       }
 
       res.status(200).send(obj);
diff --git a/pages/createTeam.tsx b/pages/createTeam.tsx
index 97a84ce1..1b18c856 100644
--- a/pages/createTeam.tsx
+++ b/pages/createTeam.tsx
@@ -22,6 +22,11 @@ export default function CreateTeam() {
   const [ftcAutoData, setFtcAutoData] = useState<Team>();
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState("");
+  const [allianceNumber,setAllianceNumber] = useState<number>();
+  const [allianceName, setAllianceName] = useState<string>();
+  const [creatingTeam, setCreatingTeam] = useState<boolean>();
+  const [settingState, setSettingState] = useState<boolean>(true)
+
 
   const searchTeam = async () => {
     if (!teamNumber) {
@@ -50,6 +55,7 @@ export default function CreateTeam() {
   };
 
   const createTeam = async (league: League) => {
+    setError("")
     if (!autoData || !session?.user) {
       return;
     }
@@ -82,6 +88,47 @@ export default function CreateTeam() {
     win.location = `/${newTeam.slug}`;
   };
 
+  async function createAlliance(league: League){
+    setError("")
+    console.log("Beginning Alliance Creation")
+    if (!session?.user) {
+      return;
+    }
+
+
+    if (
+      await api.findTeamByNumberAndLeague(Number(allianceNumber), league)
+    ) {
+      console.log(allianceNumber)
+      console.log(league)
+      setError("This Team Already Exists");
+      return;
+    }
+
+    if (allianceNumber?.toString().length!=7){
+      setError("Alliances must have a seven digit number")
+      return
+    }
+
+    if(!allianceName) {
+      setError("Your alliance must have a name")
+      return
+    }
+    console.log("Made part 2")
+
+    
+    const newTeam = await api.createTeam(
+      allianceName,
+      allianceNumber!,
+      session.user._id,
+      "none",
+      league
+    );
+    console.log("Created")
+    const win: Window = window;
+    win.location = `/${newTeam.slug}`;
+  }
+
   useEffect(() => {
     searchTeam();
   }, [teamNumber]);
@@ -94,11 +141,27 @@ export default function CreateTeam() {
         mode="col"
         className="md:h-full items-center md:justify-center max-sm:py-10"
       >
-        <Card title="Create a Team" className="">
+        {settingState ?  
+        <Card title="Create an Organization" className="">
+          <div className="divider"></div>
+        <div className="btn btn-primary" onClick={()=>{
+          setSettingState(false)
+          setCreatingTeam(false)
+          }}>Create an Alliance</div>
+        <div></div>
+        <div className="btn btn-primary" onClick={()=>{
+          setSettingState(false)
+          setCreatingTeam(true)
+        }}>Create a team</div>
+        </Card>
+        :
+        
+        creatingTeam? <Card title="Create a Team" className="">
           <h1 className="font-semibold text-accent md:ml-4">
             Search our database with your teams number
           </h1>
           <h1 className="text-error">{error}</h1>
+          <div className="btn btn-primary" onClick={()=>setSettingState(true)}>Go Back</div>
           <div className="divider"></div>
           <input
             className="input input-bordered md:w-1/2"
@@ -120,6 +183,7 @@ export default function CreateTeam() {
                     <div onClick={() => createTeam(League.FRC)}>
                       <TeamCard team={autoData} />
                     </div>
+                    
                   }
                   { ftcAutoData?.name &&
                     <div onClick={() => createTeam(League.FTC)}>
@@ -130,7 +194,38 @@ export default function CreateTeam() {
               )}
             </div>
           )}
-        </Card>
+        </Card> 
+
+        : 
+
+        <Card title="Create an Alliance" className="">
+          <h1 className="font-semibold text-accent md:ml-4">
+            Create your Scouting Alliance
+          </h1>
+          <h1 className="text-error">{error}</h1>
+          <div className="btn btn-primary" onClick={()=>setSettingState(true)}>Go Back</div>
+          <div className="divider"></div>
+          <input
+            className="input input-bordered md:w-1/2"
+            placeholder="Alliance ID (7 characters)"
+            maxLength={7}
+            minLength={7}
+            value={allianceNumber}
+            onChange={(e) => {
+              setAllianceNumber(Number(e.target.value));
+            }}
+          ></input>
+          <input
+            className="input input-bordered md:w-1/2"
+            placeholder="Alliance Name"
+            value={allianceName}
+            onChange={(e) => {
+              setAllianceName(e.target.value);
+            }}
+          ></input>
+          <div></div>
+          <div className="btn btn-secondary" onClick={() => createAlliance(League.FRC)}>Create Alliance</div>
+        </Card>}
       </Flex>
     </Container>
   );