diff --git a/latex/main.tex b/latex/main.tex
index 8a2bb8e..ac45e65 100644
--- a/latex/main.tex
+++ b/latex/main.tex
@@ -1,4 +1,4 @@
-\documentclass{thesis}
+\documentclass[draftmark]{thesis}
 
 % Title Information
 \setthesisinfo
diff --git a/latex/thesis.cls b/latex/thesis.cls
index 8f7d4c6..763bae4 100644
--- a/latex/thesis.cls
+++ b/latex/thesis.cls
@@ -1,6 +1,11 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{thesis}[2025/05/10 Bachelor Thesis Class]
 
+\newif\if@draftmark
+\@draftmarkfalse
+
+\DeclareOption{draftmark}{\@draftmarktrue}
+\ProcessOptions \relax
 \LoadClass[a4paper,12pt]{report}
 
 % Load common packages
@@ -15,8 +20,18 @@
 \RequirePackage{tocloft}
 \RequirePackage{tocbibind}
 
+% Conditionally load the watermark package and settings
+\if@draftmark
+  \RequirePackage{draftwatermark}
+  \SetWatermarkText{Draft: \today [wip]}
+  \SetWatermarkColor[gray]{0.7}
+  \SetWatermarkFontSize{2cm}
+  \SetWatermarkAngle{90}
+  \SetWatermarkHorCenter{1.5cm}
+\fi
+
 % Page layout
-\geometry{margin=1in}
+\geometry{left=3cm, top=3cm, right=3cm, bottom=3cm}
 \setlength{\parskip}{0.5em}
 \setlength{\parindent}{0pt}
 \onehalfspacing