diff --git a/index.php b/index.php
index 54a1298..485ade8 100644
--- a/index.php
+++ b/index.php
@@ -10,12 +10,31 @@
 
 use src\core\Route;
 
-Route::add("GET", "/webskills/", "MainController::goToMain");
-Route::add("GET", "/webskills/main", "MainController::main");
-Route::add("GET", "/webskills/src/user/account/login", "UserController::getLogin");
-Route::add("GET", "/webskills/src/user/account/register", "UserController::getRegister");
+function test () {
+    echo "test";
+};
 
-Route::add("POST", "/webskills/src/user/account/login", "UserController::postLogin");
-Route::add("POST", "/webskills/src/user/account/register", "UserController::postRegister");
+function test2 () {
+    echo "test2";
+};
 
-Route::run();
\ No newline at end of file
+
+function test3 ($request) {
+    echo "<pre>";
+    print_r($request);
+    echo "</pre>";
+};
+
+Route::add("GET", "/", "test");
+Route::add("GET", "/test", "test");
+Route::add("GET", "/test2", "test2");
+Route::add("GET", "/test3/([0-9]+)", "test3");
+//Route::add("GET", "/webskills/", "MainController::goToMain");
+//Route::add("GET", "/webskills/main", "MainController::main");
+//Route::add("GET", "/webskills/src/user/account/login", "UserController::getLogin");
+//Route::add("GET", "/webskills/src/user/account/register", "UserController::getRegister");
+//
+//Route::add("POST", "/webskills/src/user/account/login", "UserController::postLogin");
+//Route::add("POST", "/webskills/src/user/account/register", "UserController::postRegister");
+
+Route::run();
diff --git a/router.php b/router.php
new file mode 100644
index 0000000..ba64aed
--- /dev/null
+++ b/router.php
@@ -0,0 +1,8 @@
+<?php
+    // php built-in server로 실행시킬 때 사용하는 Router
+    if (!preg_match("/^([^.]+)$/", $_SERVER['REQUEST_URI'])) {
+        return false;
+    }
+
+    $_GET['url'] = $_SERVER['REQUEST_URI'];
+    include_once("./index.php");
diff --git a/src/core/Route.php b/src/core/Route.php
index e1bae67..654f27e 100644
--- a/src/core/Route.php
+++ b/src/core/Route.php
@@ -3,23 +3,24 @@
 namespace src\core;
 
 class Route{
-	private static $routes = [];
+    private static array $routes = [];
 
-	public static function add($method, $path, $callback) {
-		self::$routes[] = compact("method", "path", "callback");
-	}
+    public static function add($method, $uri, $callback) {
+        $uriReg = str_replace("/", "\/", $uri ?? '/');
+        $uriReg = "/^{$uriReg}$/";
+        self::$routes[] = compact("method", "uriReg", "callback");
+    }
 
-	public static function run() {
-		return call_user_func(
-			current(
-				array_filter(self::$routes, function($route) {return self::match($route["method"], $route["path"]);})
-			)["callback"]
-		);
-	}
+    public static function run() {
+        $route = current(array_filter(self::$routes, fn($route) => self::match($route)));
+        preg_match_all($route['uriReg'], $_SERVER['REQUEST_URI'], $params, 0);
+        $request = ['params' => $params];
+        return call_user_func($route["callback"], $request);
+    }
 
-	private static function match($method, $path) {
-		return $method === $_SERVER["REQUEST_METHOD"] && $path === $_SERVER["REQUEST_URI"] ?? "/";
-	}
-};
+    private static function match($route) {
+        return $route['method'] === $_SERVER["REQUEST_METHOD"] &&
+               preg_match($route['uriReg'], $_SERVER["REQUEST_URI"]);
+    }
 
-?>
\ No newline at end of file
+}