diff --git a/music/library b/music/library
new file mode 120000
index 0000000..20756bd
--- /dev/null
+++ b/music/library
@@ -0,0 +1 @@
+/home/fade/Media/Music
\ No newline at end of file
diff --git a/music/library/Artist1/Album1/track1.mp3 b/music/library/Artist1/Album1/track1.mp3
deleted file mode 100644
index 7459abf..0000000
--- a/music/library/Artist1/Album1/track1.mp3
+++ /dev/null
@@ -1 +0,0 @@
-dummy mp3 content
diff --git a/music/library/Artist2/Album2/track2.flac b/music/library/Artist2/Album2/track2.flac
deleted file mode 100644
index dae1b22..0000000
--- a/music/library/Artist2/Album2/track2.flac
+++ /dev/null
@@ -1 +0,0 @@
-dummy flac content
diff --git a/music/library/test-song.mp3 b/music/library/test-song.mp3
deleted file mode 100644
index c2d1eba..0000000
--- a/music/library/test-song.mp3
+++ /dev/null
@@ -1 +0,0 @@
-dummy audio content
diff --git a/template/admin.chtml b/template/admin.chtml
index ee844a5..25dec38 100644
--- a/template/admin.chtml
+++ b/template/admin.chtml
@@ -4,14 +4,14 @@
   <title data-text="title">Asteroid Radio - Admin Dashboard</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" type="text/css" href="/static/asteroid.css">
+  <link rel="stylesheet" type="text/css" href="/asteroid/static/asteroid.css">
 </head>
 <body>
   <div class="container">
     <h1>🎛️ ADMIN DASHBOARD</h1>
     <div class="nav">
-      <a href="/">← Back to Main</a>
-      <a href="/player/">Web Player</a>
+      <a href="/asteroid/">← Back to Main</a>
+      <a href="/asteroid/player/">Web Player</a>
     </div>
     
     <!-- System Status -->
diff --git a/template/front-page.chtml b/template/front-page.chtml
index 4754e5f..ef22c3b 100644
--- a/template/front-page.chtml
+++ b/template/front-page.chtml
@@ -8,6 +8,7 @@
 </head>
 <body>
   <div class="container">
+<<<<<<< HEAD
     <header>
       <h1 data-text="station-name">🎵 ASTEROID RADIO 🎵</h1>
       <nav>
@@ -47,6 +48,79 @@
         <p>Duration: <span data-text="now-playing-duration">∞</span></p>
       </div>
     </main>
+||||||| f4a3987
+    <h1 data-text="station-name">🎵 ASTEROID RADIO 🎵</h1>
+    <div class="status">
+      <h2>Station Status</h2>
+      <p data-text="status-message">🟢 LIVE - Broadcasting asteroid music for hackers</p>
+      <p>Current listeners: <span data-text="listeners">0</span></p>
+      <p>Stream quality: <span data-text="stream-quality">128kbps MP3</span></p>
+    </div>
+    <div class="nav">
+      <a href="/admin">Admin Dashboard</a>
+      <a href="/player/">Web Player</a>
+      <a href="http://localhost:8000/asteroid.mp3" target="_blank">🎵 Live Stream</a>
+      <a href="/status">API Status</a>
+    </div>
+    
+    <div class="live-stream">
+      <h2>🔴 LIVE STREAM</h2>
+      <p><strong>Stream URL:</strong> <code>http://localhost:8000/asteroid.mp3</code></p>
+      <p><strong>Format:</strong> MP3 128kbps Stereo</p>
+      <p><strong>Status:</strong> <span style="color: #00ff00;">● BROADCASTING</span></p>
+      <audio controls style="width: 100%; margin: 10px 0;">
+        <source src="http://localhost:8000/asteroid.mp3" type="audio/mpeg">
+        Your browser does not support the audio element.
+      </audio>
+    </div>
+    <div>
+      <h2>Now Playing</h2>
+      <p>Artist: <span data-text="now-playing-artist">The Void</span></p>
+      <p>Track: <span data-text="now-playing-track">Silence</span></p>
+      <p>Album: <span data-text="now-playing-album">Startup Sounds</span></p>
+      <p>Duration: <span data-text="now-playing-duration">∞</span></p>
+    </div>
+=======
+    <header>
+      <h1 data-text="station-name">🎵 ASTEROID RADIO 🎵</h1>
+      <nav>
+        <a href="/asteroid/">Home</a>
+        <a href="/asteroid/player/">Player</a>
+        <a href="/asteroid/admin">Admin</a>
+        <a href="/asteroid/status">Status</a>
+        <a href="/asteroid/login">Login</a>
+        <a href="/asteroid/register">Register</a>
+      </nav>
+    </header>
+
+    <main>
+      <div class="status">
+        <h2>Station Status</h2>
+        <p data-text="status-message">🟢 LIVE - Broadcasting asteroid music for hackers</p>
+        <p>Current listeners: <span data-text="listeners">0</span></p>
+        <p>Stream quality: <span data-text="stream-quality">128kbps MP3</span></p>
+      </div>
+      
+      <div class="live-stream">
+        <h2>🔴 LIVE STREAM</h2>
+        <p><strong>Stream URL:</strong> <code>http://localhost:8000/asteroid.mp3</code></p>
+        <p><strong>Format:</strong> MP3 128kbps Stereo</p>
+        <p><strong>Status:</strong> <span style="color: #00ff00;">● BROADCASTING</span></p>
+        <audio controls style="width: 100%; margin: 10px 0;">
+          <source src="http://localhost:8000/asteroid.mp3" type="audio/mpeg">
+          Your browser does not support the audio element.
+        </audio>
+      </div>
+      
+      <div class="now-playing">
+        <h2>Now Playing</h2>
+        <p>Artist: <span data-text="now-playing-artist">The Void</span></p>
+        <p>Track: <span data-text="now-playing-track">Silence</span></p>
+        <p>Album: <span data-text="now-playing-album">Startup Sounds</span></p>
+        <p>Duration: <span data-text="now-playing-duration">∞</span></p>
+      </div>
+    </main>
+>>>>>>> SystemConfiguration
   </div>
 </body>
 </html>
diff --git a/template/login.chtml b/template/login.chtml
index ef45cd1..e4344c5 100644
--- a/template/login.chtml
+++ b/template/login.chtml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -38,3 +39,46 @@
   </div>
 </body>
 </html>
+||||||| f4a3987
+=======
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <title data-text="title">Asteroid Radio - Login</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" type="text/css" href="/asteroid/static/asteroid.css">
+</head>
+<body>
+  <div class="container">
+    <h1>🎵 ASTEROID RADIO - LOGIN</h1>
+    <div class="auth-container">
+      <div class="auth-form">
+        <h2>System Access</h2>
+        <div class="message error" data-attr="style" data-attr-value="display-error">
+          <span data-text="error-message">Invalid username or password</span>
+        </div>
+        <form method="post" action="/asteroid/login">
+          <div class="form-group">
+            <label>Username:</label>
+            <input type="text" name="username" required>
+          </div>
+          <div class="form-group">
+            <label>Password:</label>
+            <input type="password" name="password" required>
+          </div>
+          <div class="form-actions">
+            <button type="submit" class="btn btn-primary" style="width: 100%;">LOGIN</button>
+          </div>
+        </form>
+        <div class="panel" style="margin-top: 20px; text-align: center;">
+          <strong style="color: #ff6600;">Default Admin Credentials:</strong><br>
+          Username: <code style="color: #00ff00;">admin</code><br>
+          Password: <code style="color: #00ff00;">asteroid123</code>
+        </div>
+      </div>
+    </div>
+  </div>
+</body>
+</html>
+>>>>>>> SystemConfiguration
diff --git a/template/player.chtml b/template/player.chtml
index 3502ae5..9b68e93 100644
--- a/template/player.chtml
+++ b/template/player.chtml
@@ -4,14 +4,14 @@
   <title data-text="title">Asteroid Radio - Web Player</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" type="text/css" href="/static/asteroid.css">
+  <link rel="stylesheet" type="text/css" href="/asteroid/static/asteroid.css">
 </head>
 <body>
   <div class="container">
     <h1>🎵 WEB PLAYER</h1>
     <div class="nav">
-      <a href="/">← Back to Main</a>
-      <a href="/admin">Admin Dashboard</a>
+      <a href="/asteroid/">← Back to Main</a>
+      <a href="/asteroid/admin">Admin Dashboard</a>
     </div>
     
     <!-- Track Browser -->
diff --git a/users.lisp b/users.lisp
new file mode 100644
index 0000000..8466ca5
--- /dev/null
+++ b/users.lisp
@@ -0,0 +1,2 @@
+(in-package :asteroid)
+
