diff --git a/backend/.gitignore b/backend/.gitignore
index ac02d06..de1fe90 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -12,6 +12,9 @@ __pycache__/
 # C extensions
 *.so
 
+# Pytest reports
+report.html
+
 # Distribution / packaging
 .Python
 build/
diff --git a/backend/report.html b/backend/report.html
index 7595912..247ef2a 100644
--- a/backend/report.html
+++ b/backend/report.html
@@ -328,7 +328,7 @@ div.media {
   </head>
   <body>
     <h1 id="title">Backend Testing Report</h1>
-    <p>Report generated on 21-Jun-2025 at 12:49:54 by <a href="https://pypi.python.org/pypi/pytest-html">pytest-html</a>
+    <p>Report generated on 22-Jun-2025 at 14:22:05 by <a href="https://pypi.python.org/pypi/pytest-html">pytest-html</a>
         v4.1.1</p>
     <div id="environment-header">
       <h2>Environment</h2>
@@ -382,7 +382,7 @@ div.media {
         <h2>Summary</h2>
         <div class="additional-summary prefix">
         </div>
-        <p class="run-count">2 tests took 00:00:14.</p>
+        <p class="run-count">1 test took 00:00:11.</p>
         <p class="filter">(Un)check the boxes to filter the results.</p>
         <div class="summary__reload">
           <div class="summary__reload__button hidden" onclick="location.reload()">
@@ -393,7 +393,7 @@ div.media {
         <div class="controls">
           <div class="filters">
             <input checked="true" class="filter" name="filter_checkbox" type="checkbox" data-test-result="failed" />
-            <span class="failed">2 Failed,</span>
+            <span class="failed">1 Failed,</span>
             <input checked="true" class="filter" name="filter_checkbox" type="checkbox" data-test-result="passed" disabled/>
             <span class="passed">0 Passed,</span>
             <input checked="true" class="filter" name="filter_checkbox" type="checkbox" data-test-result="skipped" disabled/>
@@ -432,7 +432,7 @@ div.media {
     </table>
   </body>
   <footer>
-    <div id="data-container" data-jsonblob="{&#34;environment&#34;: {&#34;Python&#34;: &#34;3.12.3&#34;, &#34;Platform&#34;: &#34;Linux-6.8.0-62-generic-x86_64-with-glibc2.39&#34;, &#34;Packages&#34;: {&#34;pytest&#34;: &#34;8.3.4&#34;, &#34;pluggy&#34;: &#34;1.5.0&#34;}, &#34;Plugins&#34;: {&#34;html&#34;: &#34;4.1.1&#34;, &#34;anyio&#34;: &#34;4.8.0&#34;, &#34;metadata&#34;: &#34;3.1.1&#34;}}, &#34;tests&#34;: {&#34;src/tests/test_nearby.py::test_nearby[location0-2000]&#34;: [{&#34;extras&#34;: [], &#34;result&#34;: &#34;Failed&#34;, &#34;testId&#34;: &#34;src/tests/test_nearby.py::test_nearby[location0-2000]&#34;, &#34;resultsTableRow&#34;: [&#34;&lt;td class=\&#34;col-result\&#34;&gt;Failed&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-testId\&#34;&gt;src/tests/test_nearby.py::test_nearby[location0-2000]&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-duration\&#34;&gt;00:00:06&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-links\&#34;&gt;&lt;/td&gt;&#34;], &#34;log&#34;: &#34;client = &amp;lt;starlette.testclient.TestClient object at 0x73af20ed1be0&amp;gt;, location = [45.7576485, 4.8330241], status_code = 2000\n\n    @pytest.mark.parametrize(\n        &amp;quot;location,status_code&amp;quot;,\n        [\n            ([45.7576485, 4.8330241], 2000),     # Lyon, Bellecour.\n            ([41.4020572, 2.1818985], 2000),       # Barcelona\n        ]\n    )\n    def test_nearby(client, location, status_code):    # pylint: disable=redefined-outer-name\n        &amp;quot;&amp;quot;&amp;quot;\n        Test n\u00b01 : Verify handling of invalid input.\n    \n        Args:\n            client:\n            request:\n        &amp;quot;&amp;quot;&amp;quot;\n        response = client.post(f&amp;quot;/landmarks/get-nearby/{location[0]}/{location[1]}&amp;quot;)\n        print(response)\n        print(response.json())\n        suggestions = response.json()\n    \n        # checks :\n&amp;gt;       assert response.status_code == status_code  # check for successful planning\nE       assert 200 == 2000\nE        +  where 200 = &amp;lt;Response [200 OK]&amp;gt;.status_code\n\nsrc/tests/test_nearby.py:36: AssertionError\n\n----------------------------- Captured stdout call -----------------------------\n&amp;lt;Response [200 OK]&amp;gt;\n[{&amp;#x27;name&amp;#x27;: &amp;#x27;Basilique Saint-Bonaventure&amp;#x27;, &amp;#x27;type&amp;#x27;: &amp;#x27;sightseeing&amp;#x27;, &amp;#x27;location&amp;#x27;: [45.763057, 4.8369311], &amp;#x27;osm_type&amp;#x27;: &amp;#x27;way&amp;#x27;, &amp;#x27;osm_id&amp;#x27;: 60803772, &amp;#x27;attractiveness&amp;#x27;: 437, &amp;#x27;n_tags&amp;#x27;: 22, &amp;#x27;image_url&amp;#x27;: None, &amp;#x27;website_url&amp;#x27;: None, &amp;#x27;wiki_url&amp;#x27;: &amp;#x27;fr:Basilique Saint-Bonaventure de Lyon&amp;#x27;, &amp;#x27;keywords&amp;#x27;: {}, &amp;#x27;description&amp;#x27;: None, &amp;#x27;duration&amp;#x27;: 5, &amp;#x27;name_en&amp;#x27;: None, &amp;#x27;uuid&amp;#x27;: &amp;#x27;ff67ba84-3db7-4cb8-9173-2332328d308e&amp;#x27;, &amp;#x27;must_do&amp;#x27;: False, &amp;#x27;must_avoid&amp;#x27;: False, &amp;#x27;is_secondary&amp;#x27;: False, &amp;#x27;time_to_reach_next&amp;#x27;: 0, &amp;#x27;next_uuid&amp;#x27;: None, &amp;#x27;is_viewpoint&amp;#x27;: False, &amp;#x27;is_place_of_worship&amp;#x27;: False}]\n\n------------------------------ Captured log call -------------------------------\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:81 Starting to fetch landmarks around (45.7576485, 4.8330241)...\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:96 Found 1 sightseeing landmarks\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:109 Found 0 nature landmarks\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:116 Found 0 shopping landmarks\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:134 Found 1 landmarks in total.\nINFO     src.main:main.py:268 Suggested landmarks :\n\tLandmark(sightseeing): [Basilique Saint-Bonaventure @(45.763057, 4.8369311), score=437]\nINFO     httpx:_client.py:1025 HTTP Request: POST http://testserver/landmarks/get-nearby/45.7576485/4.8330241 &amp;quot;HTTP/1.1 200 OK&amp;quot;\n\n&#34;}], &#34;src/tests/test_nearby.py::test_nearby[location1-2000]&#34;: [{&#34;extras&#34;: [], &#34;result&#34;: &#34;Failed&#34;, &#34;testId&#34;: &#34;src/tests/test_nearby.py::test_nearby[location1-2000]&#34;, &#34;resultsTableRow&#34;: [&#34;&lt;td class=\&#34;col-result\&#34;&gt;Failed&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-testId\&#34;&gt;src/tests/test_nearby.py::test_nearby[location1-2000]&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-duration\&#34;&gt;00:00:07&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-links\&#34;&gt;&lt;/td&gt;&#34;], &#34;log&#34;: &#34;client = &amp;lt;starlette.testclient.TestClient object at 0x73af20ed1be0&amp;gt;, location = [41.4020572, 2.1818985], status_code = 2000\n\n    @pytest.mark.parametrize(\n        &amp;quot;location,status_code&amp;quot;,\n        [\n            ([45.7576485, 4.8330241], 2000),     # Lyon, Bellecour.\n            ([41.4020572, 2.1818985], 2000),       # Barcelona\n        ]\n    )\n    def test_nearby(client, location, status_code):    # pylint: disable=redefined-outer-name\n        &amp;quot;&amp;quot;&amp;quot;\n        Test n\u00b01 : Verify handling of invalid input.\n    \n        Args:\n            client:\n            request:\n        &amp;quot;&amp;quot;&amp;quot;\n        response = client.post(f&amp;quot;/landmarks/get-nearby/{location[0]}/{location[1]}&amp;quot;)\n        print(response)\n        print(response.json())\n        suggestions = response.json()\n    \n        # checks :\n&amp;gt;       assert response.status_code == status_code  # check for successful planning\nE       assert 500 == 2000\nE        +  where 500 = &amp;lt;Response [500 Internal Server Error]&amp;gt;.status_code\n\nsrc/tests/test_nearby.py:36: AssertionError\n\n----------------------------- Captured stdout call -----------------------------\n&amp;lt;Response [500 Internal Server Error]&amp;gt;\n{&amp;#x27;detail&amp;#x27;: &amp;#x27;No landmarks were found.&amp;#x27;}\n\n------------------------------ Captured log call -------------------------------\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:81 Starting to fetch landmarks around (41.4020572, 2.1818985)...\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:96 Found 0 sightseeing landmarks\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:109 Found 0 nature landmarks\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:116 Found 0 shopping landmarks\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:134 Found 0 landmarks in total.\nINFO     httpx:_client.py:1025 HTTP Request: POST http://testserver/landmarks/get-nearby/41.4020572/2.1818985 &amp;quot;HTTP/1.1 500 Internal Server Error&amp;quot;\n\n&#34;}]}, &#34;renderCollapsed&#34;: [&#34;passed&#34;], &#34;initialSort&#34;: &#34;result&#34;, &#34;title&#34;: &#34;Backend Testing Report&#34;}"></div>
+    <div id="data-container" data-jsonblob="{&#34;environment&#34;: {&#34;Python&#34;: &#34;3.12.3&#34;, &#34;Platform&#34;: &#34;Linux-6.8.0-62-generic-x86_64-with-glibc2.39&#34;, &#34;Packages&#34;: {&#34;pytest&#34;: &#34;8.3.4&#34;, &#34;pluggy&#34;: &#34;1.5.0&#34;}, &#34;Plugins&#34;: {&#34;html&#34;: &#34;4.1.1&#34;, &#34;anyio&#34;: &#34;4.8.0&#34;, &#34;metadata&#34;: &#34;3.1.1&#34;}}, &#34;tests&#34;: {&#34;src/tests/test_trip_generation.py::test_bellecour&#34;: [{&#34;extras&#34;: [], &#34;result&#34;: &#34;Failed&#34;, &#34;testId&#34;: &#34;src/tests/test_trip_generation.py::test_bellecour&#34;, &#34;resultsTableRow&#34;: [&#34;&lt;td class=\&#34;col-result\&#34;&gt;Failed&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-testId\&#34;&gt;src/tests/test_trip_generation.py::test_bellecour&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td&gt;N/A&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-duration\&#34;&gt;00:00:11&lt;/td&gt;&#34;, &#34;&lt;td class=\&#34;col-links\&#34;&gt;&lt;/td&gt;&#34;], &#34;log&#34;: &#34;client = &amp;lt;starlette.testclient.TestClient object at 0x743408de3fb0&amp;gt;, request = &amp;lt;FixtureRequest for &amp;lt;Function test_bellecour&amp;gt;&amp;gt;\n\n    def test_bellecour(client, request) :   # pylint: disable=redefined-outer-name\n        &amp;quot;&amp;quot;&amp;quot;\n        Test n\u00b02 : Custom test in Lyon centre to ensure proper decision making in crowded area.\n    \n        Args:\n            client:\n            request:\n        &amp;quot;&amp;quot;&amp;quot;\n        start_time = time.time()  # Start timer\n    \n        # Define the trip preferences\n        prefs = Preferences(\n            sightseeing = Preference(\n                type=&amp;#x27;sightseeing&amp;#x27;,\n                score=5\n            ),\n            shopping = Preference(\n                type=&amp;#x27;shopping&amp;#x27;,\n                score=5\n            ),\n            nature = Preference(\n                type=&amp;#x27;nature&amp;#x27;,\n                score=5\n            ),\n            max_time_minute=120,\n            detour_tolerance_minute=0,\n        )\n    \n        # Define the starting coordinates\n        start = [45.7576485, 4.8330241]\n    \n        # Step 1 : request the list of landmarks in the vicinty of the starting point\n        response = client.post(\n            &amp;quot;/get/landmarks&amp;quot;,\n            json={\n                &amp;quot;preferences&amp;quot;: prefs.model_dump(),\n                &amp;quot;start&amp;quot;: start\n                }\n            )\n        landmarks = response.json()\n    \n        # Step 2 : Feed the landmarks to the optimizer to compute the trip\n        response = client.post(\n            &amp;quot;/optimize/trip&amp;quot;,\n            json={\n                &amp;quot;preferences&amp;quot;: prefs.model_dump(),\n                &amp;quot;landmarks&amp;quot;: landmarks,\n                &amp;quot;start&amp;quot;: start\n                }\n            )\n        result = response.json()\n        print(result)\n        landmarks = load_trip_landmarks(client, result[&amp;#x27;first_landmark_uuid&amp;#x27;])\n    \n        # Get computation time\n        comp_time = time.time() - start_time\n    \n        # Add details to report\n        # log_trip_details(request, landmarks, result[&amp;#x27;total_time&amp;#x27;], duration_minutes)\n    \n        # checks :\n        # assert response.status_code == 200  # check for successful planning\n        # assert comp_time &amp;lt; 30, f&amp;quot;Computation time exceeded 30 seconds: {comp_time:.2f} seconds&amp;quot;\n        # assert duration_minutes*0.8 &amp;lt; result[&amp;#x27;total_time&amp;#x27;], f&amp;quot;Trip too short: {result[&amp;#x27;total_time&amp;#x27;]} instead of {duration_minutes}&amp;quot;\n        # assert duration_minutes*1.2 &amp;gt; result[&amp;#x27;total_time&amp;#x27;], f&amp;quot;Trip too long: {result[&amp;#x27;total_time&amp;#x27;]} instead of {duration_minutes}&amp;quot;\n&amp;gt;       assert 2 == 3\nE       assert 2 == 3\n\nsrc/tests/test_trip_generation.py:82: AssertionError\n\n----------------------------- Captured stdout call -----------------------------\n{&amp;#x27;uuid&amp;#x27;: &amp;#x27;9dc5ee62-1c08-4f4f-a6e9-79dcff95a9ea&amp;#x27;, &amp;#x27;total_time&amp;#x27;: 131, &amp;#x27;first_landmark_uuid&amp;#x27;: &amp;#x27;9307e9ae-2649-4d1e-b73c-bb2d6bd8ae7e&amp;#x27;}\n\n------------------------------ Captured log call -------------------------------\nINFO     src.landmarks.landmarks_routes:landmarks_routes.py:46 Requested new trip generation. Details:\n\tCoordinates: (45.7576485, 4.8330241)\n\tTime: 120\n\tSightseeing: 5\n\tNature: 5\n\tShopping: 5\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:81 Starting to fetch landmarks around (45.7576485, 4.8330241)...\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:96 Found 161 sightseeing landmarks\nINFO     src.landmarks.cluster_manager:cluster_manager.py:137 Found 3 different sightseeing clusters.\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:109 Found 91 nature landmarks\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:116 Found 10 shopping landmarks\nINFO     src.landmarks.cluster_manager:cluster_manager.py:137 Found 5 different shopping clusters.\nINFO     src.landmarks.landmarks_manager:landmarks_manager.py:134 Found 232 landmarks in total.\nINFO     src.landmarks.landmarks_routes:landmarks_routes.py:60 Fetched 232 landmarks in  \t: 0.048 seconds\nINFO     httpx:_client.py:1025 HTTP Request: POST http://testserver/get/landmarks &amp;quot;HTTP/1.1 200 OK&amp;quot;\nINFO     src.optimization.optimization_routes:optimization_routes.py:62 No end coordinates provided. Using start=end.\nINFO     src.optimization.optimization_routes:optimization_routes.py:67 Requested new trip generation. Details:\n\tCoordinates: (45.7576485, 4.8330241)\n\tTime: 120\n\tSightseeing: 5\n\tNature: 5\n\tShopping: 5\nINFO     src.optimization.optimizer:optimizer.py:637 Re-optimized 14 times, objective value : 4024\nINFO     src.optimization.optimizer:optimizer.py:637 Re-optimized 6 times, objective value : 5085\nINFO     src.optimization.optimization_routes:optimization_routes.py:124 Total computation time\t: 10.782 seconds\nINFO     src.optimization.optimization_routes:optimization_routes.py:129 Optimized a trip of 131 minutes with 11 landmarks in 10.782 seconds.\nINFO     src.optimization.optimization_routes:optimization_routes.py:130 Detailed trip :\n\tLandmark(start): [start @(45.7576485, 4.8330241), score=0, time_to_next=7]\n\tLandmark(sightseeing): [Grande Synagogue de Lyon @(45.7570917, 4.8277901), score=217, time_to_next=3]\n\tLandmark(sightseeing): [\u00c9glise Saint-Georges @(45.757672, 4.825388), score=489, time_to_next=8]\n\tLandmark(nature): [Esplanade @(45.7603525, 4.8205849), score=1748, time_to_next=6]\n\tLandmark(nature): [Pont des Quatre Vents du parc de la Sarra @(45.763172, 4.8193262), score=787, time_to_next=5]\n\tLandmark(nature): [Esplanade de Fourvi\u00e8re @(45.7627458, 4.8230054), score=565, time_to_next=9]\n\tLandmark(sightseeing): [\u00c9glise Saint-Paul @(45.7666454, 4.827052), score=238, time_to_next=15]\n\tLandmark(sightseeing): [Impasse Turquet @(45.7589037, 4.8249541), score=259, time_to_next=7]\n\tLandmark(sightseeing): [H\u00f4tel de l&amp;#x27;Europe @(45.7591956, 4.8304294), score=217, time_to_next=2]\n\tLandmark(nature): [Vue sous-terraine du Parking des C\u00e9lestins @(45.7597666, 4.8318664), score=565, time_to_next=4]\n\tLandmark(finish): [finish @(45.7576485, 4.8330241), score=0]\nINFO     src.overpass.overpass:overpass.py:405 Trip successfully returned, starting to fill cache.\nINFO     src.overpass.overpass:overpass.py:425 Successfully filled 0/0 cache files.\nINFO     httpx:_client.py:1025 HTTP Request: POST http://testserver/optimize/trip &amp;quot;HTTP/1.1 200 OK&amp;quot;\n\n&#34;}]}, &#34;renderCollapsed&#34;: [&#34;passed&#34;], &#34;initialSort&#34;: &#34;result&#34;, &#34;title&#34;: &#34;Backend Testing Report&#34;}"></div>
     <script>
       (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 const { getCollapsedCategory, setCollapsedIds } = require('./storage.js')
diff --git a/backend/src/landmarks/landmarks_manager.py b/backend/src/landmarks/landmarks_manager.py
index f7094c7..1ab1944 100644
--- a/backend/src/landmarks/landmarks_manager.py
+++ b/backend/src/landmarks/landmarks_manager.py
@@ -259,15 +259,7 @@ class LandmarkManager:
             if tags.get('shop') is not None and landmarktype != 'shopping' :
                 continue
 
-            # Maybe a bit too inefficient
-            # for key in tags.keys():
-            #     if 'disused:' in key or 'boundary:' in key :
-            #         break
-            #     if 'building:' in key or 'pay' in key :
-            #         n_tags -= 1
-
             # Convert this to Landmark object
-            # TODO: convert to proto landmark and store rest to memcache
             landmark = Landmark(name=name,
                                 type=landmarktype,
                                 location=coords,
diff --git a/backend/src/landmarks/landmarks_routes.py b/backend/src/landmarks/landmarks_routes.py
new file mode 100644
index 0000000..3794c95
--- /dev/null
+++ b/backend/src/landmarks/landmarks_routes.py
@@ -0,0 +1,117 @@
+"""Main app for backend api"""
+import logging
+import time
+import random
+from fastapi import HTTPException, APIRouter
+
+from ..structs.landmark import Landmark
+from ..structs.preferences import Preferences, Preference
+from ..landmarks.landmarks_manager import LandmarkManager
+
+
+# Setup the logger and the Landmarks Manager
+logger = logging.getLogger(__name__)
+manager = LandmarkManager()
+
+
+# Start the router
+router = APIRouter()
+
+
+@router.post("/get/landmarks")
+def get_landmarks(
+    preferences: Preferences,
+    start: tuple[float, float],
+) -> list[Landmark]:
+    """
+    Function that returns all available landmarks given some preferences and a start position.
+
+    Args:
+        preferences : the preferences specified by the user as the post body
+        start       : the coordinates of the starting point
+    Returns: 
+        list[Landmark] : The full list of fetched landmarks
+    """
+    if preferences is None:
+        raise HTTPException(status_code=406, detail="Preferences not provided or incomplete.")
+    if (preferences.shopping.score == 0 and
+        preferences.sightseeing.score == 0 and
+        preferences.nature.score == 0) :
+        raise HTTPException(status_code=406, detail="All preferences are 0.")
+    if start is None:
+        raise HTTPException(status_code=406, detail="Start coordinates not provided")
+    if not (-90 <= start[0] <= 90 or -180 <= start[1] <= 180):
+        raise HTTPException(status_code=422, detail="Start coordinates not in range")
+
+    logger.info(f"Requested new trip generation. Details:\n\tCoordinates: {start}\n\tTime: {preferences.max_time_minute}\n\tSightseeing: {preferences.sightseeing.score}\n\tNature: {preferences.nature.score}\n\tShopping: {preferences.shopping.score}")
+
+    start_time = time.time()
+
+    # Generate the landmarks from the start location
+    landmarks, _ = manager.generate_landmarks_list(
+        center_coordinates = start,
+        preferences = preferences
+    )
+
+    if len(landmarks) == 0 :
+        raise HTTPException(status_code=500, detail="No landmarks were found.")
+
+    t_generate_landmarks = time.time() - start_time
+    logger.info(f'Fetched {len(landmarks)} landmarks in  \t: {round(t_generate_landmarks,3)} seconds')
+    
+    return landmarks
+
+
+@router.post("/landmarks/get-nearby/{lat}/{lon}")
+def get_landmarks_nearby(
+    lat: float,
+    lon: float
+) -> list[Landmark] :
+    """
+    Suggests nearby landmarks based on a given latitude and longitude.
+
+    This endpoint returns a curated list of up to 5 landmarks around the given geographical coordinates. It uses fixed preferences for
+    sightseeing, shopping, and nature, with a maximum time constraint of 30 minutes to limit the number of landmarks returned.
+
+    Args:
+        lat (float): Latitude of the user's current location.
+        lon (float): Longitude of the user's current location.
+
+    Returns:
+        list[Landmark]: A list of selected nearby landmarks.
+    """
+    logger.info(f'Fetching landmarks nearby ({lat}, {lon}).')
+    # Define fixed preferences:
+    prefs = Preferences(
+        sightseeing = Preference(
+            type='sightseeing',
+            score=5
+        ),
+        shopping = Preference(
+            type='shopping',
+            score=2
+        ),
+        nature = Preference(
+            type='nature',
+            score=5
+        ),
+        max_time_minute=30,
+        detour_tolerance_minute=0,
+    )
+
+    # Find the landmarks around the location
+    _, landmarks_around = manager.generate_landmarks_list(
+        center_coordinates = (lat, lon),
+        preferences = prefs,
+        allow_clusters=False,
+    )
+    if len(landmarks_around) == 0 :
+        raise HTTPException(status_code=500, detail="No landmarks were found.")
+
+    # select 5 landmarks from there
+    if len(landmarks_around) > 6 :
+        landmarks_around = landmarks_around[:2] + random.sample(landmarks_around[3:], 2)
+    
+    logger.info(f'Found {len(landmarks_around)} landmarks nearby ({lat}, {lon}).')
+    logger.debug('Suggested landmarks :\n\t' + '\n\t'.join(f'{landmark}' for landmark in landmarks_around))
+    return landmarks_around
diff --git a/backend/src/logging_config.py b/backend/src/logging_config.py
index a00302c..3754709 100644
--- a/backend/src/logging_config.py
+++ b/backend/src/logging_config.py
@@ -33,14 +33,14 @@ def configure_logging():
         # silence the chatty logs loki generates itself
         logging.getLogger('urllib3.connectionpool').setLevel(logging.WARNING)
         # no need for time since it's added by loki or can be shown in kube logs
-        logging_format = '%(name)s - %(levelname)s - %(message)s'
+        logging_format = '%(name)-55s - %(levelname)-7s - %(message)s'
 
     else:
         # if we are in a debug (local) session, set verbose and rich logging
         from rich.logging import RichHandler
         logging_handlers = [RichHandler()]
         logging_level = logging.DEBUG if is_debug else logging.INFO
-        logging_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+        logging_format = '%(asctime)s - %(name)-55s - %(levelname)-7s - %(message)s'
 
 
 
diff --git a/backend/src/main.py b/backend/src/main.py
index 3a946c6..7213fae 100644
--- a/backend/src/main.py
+++ b/backend/src/main.py
@@ -11,7 +11,9 @@ from .structs.preferences import Preferences, Preference
 from .structs.linked_landmarks import LinkedLandmarks
 from .structs.trip import Trip
 from .landmarks.landmarks_manager import LandmarkManager
-from .toilets.toilet_routes import router as toilets_router
+from .toilets.toilets_route import router as toilets_router
+from .optimization.optimization_routes import router as optimization_router
+from .landmarks.landmarks_routes import router as landmarks_router
 from .optimization.optimizer import Optimizer
 from .optimization.refiner import Refiner
 from .overpass.overpass import fill_cache
@@ -39,13 +41,17 @@ app = FastAPI(lifespan=lifespan)
 
 
 app.include_router(toilets_router)
+app.include_router(optimization_router)
+app.include_router(landmarks_router)
 
 
 @app.post("/trip/new")
-def new_trip(preferences: Preferences,
-             start: tuple[float, float],
-             end: tuple[float, float] | None = None,
-             background_tasks: BackgroundTasks = None) -> Trip:
+def new_trip(
+    preferences: Preferences,
+    start: tuple[float, float],
+    end: tuple[float, float] | None = None,
+    background_tasks: BackgroundTasks = None
+) -> Trip:
     """
     Main function to call the optimizer.
 
@@ -226,44 +232,3 @@ def update_trip_time(trip_uuid: str, removed_landmark_uuid: str) -> Trip:
 
     return trip
 
-
-# TODO: get stuff to do nearby. The idea is to have maybe thhe 3 best things to do within 500m and 2 hidden gems. 
-@app.post("/landmarks/get-nearby/{lat}/{lon}")
-def get_landmarks_nearby(lat: float, lon: float) -> list[Landmark] :
-
-    # preferences = {"sightseeing": {"type": "sightseeing", "score": 0},
-    #                         "nature": {"type": "nature", "score": 0},
-    #                         "shopping": {"type": "shopping", "score": 5},
-    #                         "max_time_minute": 30,
-    #                         "detour_tolerance_minute": 0},
-
-    # Find the landmarks around the location
-    _, landmarks_around = manager.generate_landmarks_list(
-        center_coordinates = (lat, lon),
-        preferences = Preferences(
-            sightseeing = Preference(
-                type='sightseeing',
-                score=5
-            ),
-            shopping = Preference(
-                type='shopping',
-                score=2
-            ),
-            nature = Preference(
-                type='nature',
-                score=5
-            ),
-            max_time_minute=30,
-            detour_tolerance_minute=0),
-        allow_clusters=False
-    )
-
-    if len(landmarks_around) == 0 :
-        raise HTTPException(status_code=500, detail="No landmarks were found.")
-
-    # select 5 landmarks from there
-    if len(landmarks_around) > 6 :
-        landmarks_around = landmarks_around[:2] + random.sample(landmarks_around[3:], 2)
-    
-    logger.info('Suggested landmarks :\n\t' + '\n\t'.join(f'{landmark}' for landmark in landmarks_around))
-    return landmarks_around
diff --git a/backend/src/optimization/optimization_routes.py b/backend/src/optimization/optimization_routes.py
new file mode 100644
index 0000000..22d5cd2
--- /dev/null
+++ b/backend/src/optimization/optimization_routes.py
@@ -0,0 +1,135 @@
+"""Main app for backend api"""
+import logging
+import time
+import yaml
+from fastapi import HTTPException, APIRouter, BackgroundTasks
+
+from ..structs.landmark import Landmark
+from ..structs.preferences import Preferences
+from ..structs.linked_landmarks import LinkedLandmarks
+from ..utils.take_most_important import take_most_important
+from ..structs.trip import Trip
+from ..optimization.optimizer import Optimizer
+from ..optimization.refiner import Refiner
+from ..overpass.overpass import fill_cache
+from ..cache import client as cache_client
+from ..constants import LANDMARK_PARAMETERS_PATH
+
+
+# Setup the Logger, Optimizer and Refiner
+logger = logging.getLogger(__name__)
+optimizer = Optimizer()
+refiner = Refiner(optimizer=optimizer)
+
+
+# Start the router
+router = APIRouter()
+
+
+@router.post("/optimize/trip")
+def optimize_trip(
+    preferences: Preferences,
+    landmarks: list[Landmark],
+    start: tuple[float, float],
+    end: tuple[float, float] | None = None,
+    background_tasks: BackgroundTasks = None
+) -> Trip:
+    """
+    Main function to call the optimizer.
+
+    Args:
+        preferences (Preferences)   : the preferences specified by the user as the post body.
+        start (tuple[float, float]) : the coordinates of the starting point.
+        end tuple[float, float]     : the coordinates of the finishing point.
+        backgroud_tasks (BackgroundTasks) : necessary to fill the cache after the trip has been returned.
+    Returns: 
+        (uuid) : The uuid of the first landmark in the optimized route
+    """
+    if preferences is None:
+        raise HTTPException(status_code=406, detail="Preferences not provided or incomplete.")
+    if len(landmarks) == 0 :
+        raise HTTPException(status_code=406, detail="No landmarks provided for computing the trip.")
+    if (preferences.shopping.score == 0 and
+        preferences.sightseeing.score == 0 and
+        preferences.nature.score == 0) :
+        raise HTTPException(status_code=406, detail="All preferences are 0.")
+    if start is None:
+        raise HTTPException(status_code=406, detail="Start coordinates not provided")
+    if not (-90 <= start[0] <= 90 or -180 <= start[1] <= 180):
+        raise HTTPException(status_code=422, detail="Start coordinates not in range")
+    if end is None:
+        end = start
+        logger.info("No end coordinates provided. Using start=end.")
+
+    # Start the timer
+    start_time = time.time()
+
+    logger.info(f"Requested new trip generation. Details:\n\tCoordinates: {start}\n\tTime: {preferences.max_time_minute}\n\tSightseeing: {preferences.sightseeing.score}\n\tNature: {preferences.nature.score}\n\tShopping: {preferences.shopping.score}")
+
+    start_landmark = Landmark(name='start',
+                              type='start',
+                              location=(start[0], start[1]),
+                              osm_type='start',
+                              osm_id=0,
+                              attractiveness=0,
+                              duration=0,
+                              must_do=True,
+                              n_tags = 0)
+
+    end_landmark = Landmark(name='finish',
+                            type='finish',
+                            location=(end[0], end[1]),
+                            osm_type='end',
+                            osm_id=0,
+                            attractiveness=0,
+                            duration=0,
+                            must_do=True,
+                            n_tags=0)
+    
+    # From the parameters load the length at which to truncate the landmarks list.
+    with LANDMARK_PARAMETERS_PATH.open('r') as f:
+            parameters = yaml.safe_load(f)
+            n_important = parameters['N_important']
+
+    # Truncate to the  most important landmarks for a shorter list
+    landmarks_short = take_most_important(landmarks, n_important)
+
+    # insert start and finish to the shorter landmarks list
+    landmarks_short.insert(0, start_landmark)
+    landmarks_short.append(end_landmark)
+
+    # First stage optimization
+    try:
+        base_tour = optimizer.solve_optimization(preferences.max_time_minute, landmarks_short)
+    except Exception as exc:
+        logger.error(f"Trip generation failed: {str(exc)}")
+        raise HTTPException(status_code=500, detail=f"Optimization failed: {str(exc)}") from exc
+
+    t_first_stage = time.time() - start_time
+    start_time = time.time()
+
+    # Second stage optimization
+    try :
+        refined_tour = refiner.refine_optimization(landmarks, base_tour,
+                                               preferences.max_time_minute,
+                                               preferences.detour_tolerance_minute)
+    except Exception as exc :
+        logger.warning(f"Refiner failed. Proceeding with base trip {str(exc)}")
+        refined_tour = base_tour
+
+    t_second_stage = time.time() - start_time
+
+    logger.debug(f'First stage optimization\t: {round(t_first_stage,3)} seconds')
+    logger.debug(f'Second stage optimization\t: {round(t_second_stage,3)} seconds')
+    logger.info(f'Total computation time\t: {round(t_first_stage + t_second_stage,3)} seconds')
+    linked_tour = LinkedLandmarks(refined_tour)
+
+    # upon creation of the trip, persistence of both the trip and its landmarks is ensured.
+    trip = Trip.from_linked_landmarks(linked_tour, cache_client)
+    logger.info(f'Optimized a trip of {trip.total_time} minutes with {len(refined_tour)} landmarks in {round(t_first_stage + t_second_stage,3)} seconds.')
+    logger.info('Detailed trip :\n\t' + '\n\t'.join(f'{landmark}' for landmark in refined_tour))
+
+    background_tasks.add_task(fill_cache)
+
+    return trip
+
diff --git a/backend/src/overpass/overpass.py b/backend/src/overpass/overpass.py
index 330e4d8..ab6104e 100644
--- a/backend/src/overpass/overpass.py
+++ b/backend/src/overpass/overpass.py
@@ -402,6 +402,8 @@ def fill_cache():
     n_files = 0
     total = 0
 
+    overpass.logger.info('Trip successfully returned, starting to fill cache.')
+
     with os.scandir(OSM_CACHE_DIR) as it:
         for entry in it:
             if entry.is_file() and entry.name.startswith('hollow_'):
diff --git a/backend/src/structs/proto_landmark.py b/backend/src/structs/proto_landmark.py
deleted file mode 100644
index d09308a..0000000
--- a/backend/src/structs/proto_landmark.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from typing import Optional
-from uuid import uuid4, UUID
-from pydantic import BaseModel, Field
-
-# Output to frontend
-class ProtoLandmark(BaseModel) :
-    """fef"""
-
-    uuid: UUID = Field(default_factory=uuid4)
-
-    location : tuple
-    attractiveness : int
-    duration : Optional[int] = 5
-
-    must_do : Optional[bool] = False
-    must_avoid : Optional[bool] = False
\ No newline at end of file
diff --git a/backend/src/tests/test_main.py b/backend/src/tests/test_main.py
index c2b163e..324af46 100644
--- a/backend/src/tests/test_main.py
+++ b/backend/src/tests/test_main.py
@@ -1,4 +1,4 @@
-"""Collection of tests to ensure correct implementation and track progress. """
+"""Collection of tests to ensure correct implementation and track progress."""
 import time
 from fastapi.testclient import TestClient
 import pytest
@@ -6,6 +6,7 @@ import pytest
 from .test_utils import load_trip_landmarks, log_trip_details
 from ..main import app
 
+
 @pytest.fixture(scope="module")
 def client():
     """Client used to call the app."""
@@ -88,15 +89,13 @@ def test_bellecour(client, request) :   # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
-
     # checks :
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
     assert duration_minutes*0.8 < result['total_time'], f"Trip too short: {result['total_time']} instead of {duration_minutes}"
     assert duration_minutes*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {duration_minutes}"
 
+
 def test_cologne(client, request) :   # pylint: disable=redefined-outer-name
     """
     Test n°3 : Custom test in Cologne to ensure proper decision making in crowded area.
@@ -128,9 +127,6 @@ def test_cologne(client, request) :   # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
-
     # checks :
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
@@ -169,9 +165,6 @@ def test_strasbourg(client, request) :   # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
-
     # checks :
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
@@ -210,9 +203,6 @@ def test_zurich(client, request) :   # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
-
     # checks :
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
@@ -251,9 +241,6 @@ def test_paris(client, request) :   # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
-
     # checks :
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
@@ -292,9 +279,6 @@ def test_new_york(client, request) :   # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
-
     # checks :
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
@@ -333,9 +317,6 @@ def test_shopping(client, request) :   # pylint: disable=redefined-outer-name
     # Add details to report
     log_trip_details(request, landmarks, result['total_time'], duration_minutes)
 
-    # for elem in landmarks :
-    #     print(elem)
-
     # checks :
     assert response.status_code == 200  # check for successful planning
     assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
diff --git a/backend/src/tests/test_trip_generation.py b/backend/src/tests/test_trip_generation.py
new file mode 100644
index 0000000..441fedd
--- /dev/null
+++ b/backend/src/tests/test_trip_generation.py
@@ -0,0 +1,80 @@
+"""Collection of tests to ensure correct implementation and track progress."""
+import time
+from fastapi.testclient import TestClient
+import pytest
+
+from .test_utils import load_trip_landmarks, log_trip_details
+from ..structs.preferences import Preferences, Preference
+from ..main import app
+
+
+@pytest.fixture(scope="module")
+def client():
+    """Client used to call the app."""
+    return TestClient(app)
+
+
+def test_bellecour(client, request) :   # pylint: disable=redefined-outer-name
+    """
+    Test n°2 : Custom test in Lyon centre to ensure proper decision making in crowded area.
+    
+    Args:
+        client:
+        request:
+    """
+    start_time = time.time()  # Start timer
+
+    # Step 0: Define the trip preferences
+    prefs = Preferences(
+        sightseeing = Preference(
+            type='sightseeing',
+            score=5
+        ),
+        shopping = Preference(
+            type='shopping',
+            score=5
+        ),
+        nature = Preference(
+            type='nature',
+            score=5
+        ),
+        max_time_minute=120,
+        detour_tolerance_minute=0,
+    )
+    
+    # Define the starting coordinates
+    start = [45.7576485, 4.8330241]
+
+    # Step 1: request the list of landmarks in the vicinty of the starting point
+    response = client.post(
+        "/get/landmarks",
+        json={
+            "preferences": prefs.model_dump(),
+            "start": start
+            }
+        )
+    landmarks = response.json()
+
+    # Step 2: Feed the landmarks to the optimizer to compute the trip
+    response = client.post(
+        "/optimize/trip",
+        json={
+            "preferences": prefs.model_dump(),
+            "landmarks": landmarks,
+            "start": start
+            }
+        )
+    result = response.json()
+    landmarks = load_trip_landmarks(client, result['first_landmark_uuid'])
+
+    # Get computation time
+    comp_time = time.time() - start_time
+
+    # Add details to report
+    log_trip_details(request, landmarks, result['total_time'], prefs.max_time_minute)
+
+    # checks :
+    assert response.status_code == 200  # check for successful planning
+    assert comp_time < 30, f"Computation time exceeded 30 seconds: {comp_time:.2f} seconds"
+    assert prefs.max_time_minute*0.8 < result['total_time'], f"Trip too short: {result['total_time']} instead of {prefs.max_time_minute}"
+    assert prefs.max_time_minute*1.2 > result['total_time'], f"Trip too long: {result['total_time']} instead of {prefs.max_time_minute}"
diff --git a/backend/src/toilets/toilet_routes.py b/backend/src/toilets/toilets_route.py
similarity index 100%
rename from backend/src/toilets/toilet_routes.py
rename to backend/src/toilets/toilets_route.py
diff --git a/backend/src/utils/take_most_important.py b/backend/src/utils/take_most_important.py
index b93e1dd..b749dd7 100644
--- a/backend/src/utils/take_most_important.py
+++ b/backend/src/utils/take_most_important.py
@@ -1,15 +1,22 @@
 """Helper function to return only the major landmarks from a large list."""
 from ..structs.landmark import Landmark
 
-def take_most_important(landmarks: list[Landmark], n_important) -> list[Landmark]:
+def take_most_important(
+    landmarks: list[Landmark],
+    n_important: int
+) -> list[Landmark]:
     """
-    Given a list of landmarks, return the n_important most important landmarks
+    Given a list of landmarks, return the most important landmarks based on their attractiveness.
+    
     Args:
-    landmarks: list[Landmark] - list of landmarks
-    n_important: int - number of most important landmarks to return
+        landmarks (list[Landmark]): List of landmarks that needs to be truncated
+        n_important (int): Number of most important landmarks to return
+    
     Returns:
-    list[Landmark] - list of the n_important most important landmarks
+        list[Landmark]: List of the n_important most important landmarks
     """
+    if n_important == 0 :
+        raise ValueError('Number of landmarks to keep cannot be zero.')
 
     # Sort landmarks by attractiveness (descending)
     sorted_landmarks = sorted(landmarks, key=lambda x: x.attractiveness, reverse=True)
