diff --git a/server/src/invites.rs b/server/src/invites.rs
index edf966d..819568d 100644
--- a/server/src/invites.rs
+++ b/server/src/invites.rs
@@ -1,13 +1,14 @@
 // Module handles creating invites for potentially new users
 use diesel::{self, prelude::*};
 use rocket_contrib::json::Json;
-use rand::random;
-use crate::DBConn;
-use crate::models::Invite;
-use crate::schema;
-use crate::users::new_user_response;
-use crate::payload;
+use rocket::request::Form;
 use chrono::{Duration, Utc};
+use rand::random;
+
+use crate::auth::{join, JoinParams, AuthResult, AuthErr};
+use crate::DBConn;
+use crate::models::{User, Invite};
+use crate::schema;
 
 
 /*
@@ -44,37 +45,11 @@ pub fn generate_invite(conn: DBConn) -> Json<Invite> {
     }
 }
 
-#[get("/<hash>")]
-pub fn use_invite(hash: u64, conn: DBConn) -> Json<payload::NewUserResponse> {
-    // Grab the token from our table to make sure it's even there to begin with
-    use schema::invites::dsl::*;
-    use schema::users::dsl::*;
-
-    let diesel_result: Result<Invite, diesel::result::Error> = invites.filter(id.eq(hash)).first(&conn.0);
-    // TODO: this is getting moved elsewhere to clean up so ignore this for now
-    if let Ok(data) = diesel_result {
-        match data.uses {
-            1 ... std::i32::MAX => {
-                let user = crate::users::create_new_user();
-                match diesel::insert_into(users).values(&user).execute(&conn.0) {
-                    Ok(_v) => Json(new_user_response(&Some(user), None)),
-                    // an issue on our end gets a 500 response
-                    Err(_e) => Json(new_user_response(&None, Some("Unable to create user")))
-                }
-            }
-            // The invite has been used up and thus should be removed
-            std::i32::MIN ... 0 => {
-                // bruh
-                let _ = diesel::delete(invites.filter(id.eq(data.id)))
-                    .execute(&conn.0)
-                    .expect("Could not delete invite");
-                Json(new_user_response(&None, Some("Invalid invite")))
-            }
-        }
-    }
-    else {
-        Json(new_user_response(&None, Some("Could not create user")))
-    }
+// TODO: `params` is non-payload-supporting somehow
+// NOTE: unted functions all the way down here
+#[get("/<hash>", data = "<params>")]
+pub fn use_invite(hash: u64, params: Form<JoinParams>, conn: DBConn) ->  AuthResult<Json<User>, AuthErr>{
+    join(conn, params, hash)
 }
 
 #[cfg(test)]