diff --git a/server/internal/database/queries-user.sql b/server/internal/database/queries-user.sql
new file mode 100644
index 0000000..1a50839
--- /dev/null
+++ b/server/internal/database/queries-user.sql
@@ -0,0 +1,32 @@
+-- CreateUser :exec
+INSERT INTO users (
+  user_name, display_name, pw_hash, email_address
+) VALUES ($1, $2, $3, $4);
+
+-- DeleteUser :exec
+DELETE FROM users
+WHERE id = $1;
+
+-- UpdateUserPW :exec
+UPDATE users 
+SET pw_hash = $2
+WHERE id = $1;
+
+-- UpdateUserName :exec
+UPDATE users
+SET user_name = $2
+WHERE id = $1;
+
+
+-- UpdateUserDisplayName :exec
+UPDATE users
+SET display_name = $2
+WHERE id = $1;
+
+-- GetUser :one
+SELECT * FROM users 
+WHERE id = $1;
+
+-- GetUserByName :one
+SELECT * FROM users
+WHERE user_name = $1;
diff --git a/server/internal/database/user.go b/server/internal/database/user.go
index 979393a..f0f56b3 100644
--- a/server/internal/database/user.go
+++ b/server/internal/database/user.go
@@ -1,8 +1,2 @@
 package database
 
-type User struct {
-	Id     int64
-	Name   string `xorm:"not null unique"`
-	PwHash string //Password hash
-	Role   int64  `xorm:"default 0"`
-}