diff --git a/museum_map/server/api/__init__.py b/museum_map/server/api/__init__.py
index abccde3..2177c70 100644
--- a/museum_map/server/api/__init__.py
+++ b/museum_map/server/api/__init__.py
@@ -8,12 +8,13 @@
 
 from museum_map.__about__ import __tables__, __version__
 from museum_map.models import db_session
-from museum_map.server.api import floor_topics, floors, picks, rooms
+from museum_map.server.api import floor_topics, floors, items, picks, rooms
 
 logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api")
 router.include_router(floors.router)
 router.include_router(floor_topics.router)
+router.include_router(items.router)
 router.include_router(picks.router)
 router.include_router(rooms.router)
 
diff --git a/museum_map/server/api/floors.py b/museum_map/server/api/floors.py
index 0ee5ae9..fb83f87 100644
--- a/museum_map/server/api/floors.py
+++ b/museum_map/server/api/floors.py
@@ -18,6 +18,7 @@ async def get_floors(dbsession: Annotated[AsyncSession, Depends(db_session)]):
     """Retrieve all floors."""
     query = (
         select(Floor)
+        .order_by(Floor.level)
         .options(selectinload(Floor.rooms))
         .options(selectinload(Floor.samples))
         .options(selectinload(Floor.topics))
diff --git a/museum_map/server/api/items.py b/museum_map/server/api/items.py
new file mode 100644
index 0000000..d12004e
--- /dev/null
+++ b/museum_map/server/api/items.py
@@ -0,0 +1,23 @@
+"""Routes for accessing the item data."""
+import logging
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import selectinload
+
+from museum_map.models import Item, ItemModel, db_session
+
+router = APIRouter(prefix="/items")
+logger = logging.getLogger(__name__)
+
+
+@router.get("/", response_model=list[ItemModel])
+async def get_items(
+    iid: Annotated[list[int] | None, Query()],
+    dbsession: Annotated[AsyncSession, Depends(db_session)],
+):
+    """Retrieve items."""
+    query = select(Item).filter(Item.id.in_(iid)).options(selectinload(Item.group)).options(selectinload(Item.room))
+    return (await dbsession.execute(query)).scalars()
diff --git a/museum_map/server/api/rooms.py b/museum_map/server/api/rooms.py
index c40eb9a..1c44974 100644
--- a/museum_map/server/api/rooms.py
+++ b/museum_map/server/api/rooms.py
@@ -14,10 +14,10 @@
 
 
 @router.get("/", response_model=list[RoomModel])
-async def get_floors(
+async def get_rooms(
     dbsession: Annotated[AsyncSession, Depends(db_session)], rid: Annotated[list[int] | None, Query()] = None
 ):
-    """Retrieve all floors."""
+    """Retrieve rooms."""
     query = (
         select(Room)
         .options(selectinload(Room.group))
diff --git a/museum_map/server/frontend/src/routes/Floor.svelte b/museum_map/server/frontend/src/routes/Floor.svelte
index bfd564d..9699b92 100644
--- a/museum_map/server/frontend/src/routes/Floor.svelte
+++ b/museum_map/server/frontend/src/routes/Floor.svelte
@@ -9,11 +9,11 @@
   import Thumbnail from "../components/Thumbnail.svelte";
   import {
     floors,
-    fetchRooms,
-    busyCounter,
+    floorTopics,
+    currentFloor,
+    rooms,
+    currentRooms,
     localPreferences,
-    loadTopics,
-    loadItems,
     matchingFloors,
     matchingRooms,
     tracker,
@@ -41,7 +41,7 @@
 
   class FloorScene extends Phaser.Scene {
     floor: Floor;
-    roomObjects: MapObject[];
+    roomObjects: MapObject[] = [];
     baseMap: Phaser.GameObjects.Image;
     zoom: number;
     cameraPosition: { x: number; y: number };
@@ -60,7 +60,7 @@
       this.zoom = 1;
       this.baseMap = this.add.image(0, 0, "basemap");
       this.baseMap.setOrigin(0, 0);
-      loadRooms(this.floor.rooms).then((rooms) => {
+      /*loadRooms(this.floor.rooms).then((rooms) => {
         busyCounter.start();
         $matchingRooms = get(matchingRooms);
         for (let room of rooms) {
@@ -126,7 +126,7 @@
         }
         this.scaleObjects(false, false);
         busyCounter.stop();
-      });
+      });*/
 
       this.cameraPosition = {
         x: -this.game.canvas.width / 2 + this.baseMap.width / 2,
@@ -393,6 +393,7 @@
 
   let game: Phaser.Game | null = null;
 
+  /*
   const currentFloor = derived(
     [location, floors],
     ([location, floors]) => {
@@ -409,12 +410,12 @@
       return null;
     },
     null
-  );
+  );*/
 
   const previousFloor = derived(
     [currentFloor, floors],
     ([currentFloor, floors]) => {
-      if (currentFloor) {
+      if (currentFloor && floors) {
         let previousFloor = null;
         for (const floor of floors) {
           if (floor === currentFloor) {
@@ -431,7 +432,7 @@
   const nextFloor = derived(
     [currentFloor, floors],
     ([currentFloor, floors]) => {
-      if (currentFloor) {
+      if (currentFloor && floors) {
         let found = false;
         for (const floor of floors) {
           if (found) {
@@ -447,9 +448,65 @@
       }
     }
   );
+  // The floor topics as a floor.id -> topic dictionary
+  const topicsDict = derived(
+    floorTopics,
+    (floorTopics) => {
+      if (floorTopics) {
+        tick().then(() => {
+          if (floorListElement) {
+            const currentElement = floorListElement.querySelector(
+              ".current-floor"
+            ) as HTMLElement;
+            if (currentElement) {
+              currentElement.scrollIntoView();
+            }
+          }
+        });
+
+        const topicsDict: { [x: number]: FloorTopic[] } = {};
+        for (let floorTopic of floorTopics) {
+          if (topicsDict[floorTopic.floor]) {
+            topicsDict[floorTopic.floor].push(floorTopic);
+          } else {
+            topicsDict[floorTopic.floor] = [floorTopic];
+          }
+        }
+        return topicsDict;
+      }
+      return {};
+    },
+    {}
+  );
+
+  const searchedFloors = derived(
+    [floors, matchingFloors],
+    ([floors, matchingFloors]) => {
+      if (floors) {
+        return floors.map((floor) => {
+          return [floor, false];
+        });
+      }
+      return [];
+    },
+    []
+  );
+
+  const searchedRooms = derived(
+    [currentRooms, matchingRooms],
+    ([currentRooms, matchingRooms]) => {
+      if (currentRooms) {
+        return currentRooms.map((room) => {
+          return [room, false];
+        });
+      }
+      return [];
+    },
+    []
+  );
 
   const currentFloorUnsubscribe = currentFloor.subscribe((currentFloor) => {
-    if (currentFloor && game) {
+    /*if (currentFloor && game) {
       if (!game.scene.getScene("floor-" + currentFloor.id)) {
         game.scene.add(
           "floor-" + currentFloor.id,
@@ -479,7 +536,7 @@
           }
         });
       }
-    }
+    }*/
   });
 
   const matchingRoomsUnsubscribe = matchingRooms.subscribe((matchingRooms) => {
@@ -498,83 +555,6 @@
     }
   });
 
-  const rooms = derived(
-    currentFloor,
-    (currentFloor, set) => {
-      if (currentFloor) {
-        loadRooms(currentFloor.rooms).then((rooms) => {
-          set(rooms);
-        });
-      } else {
-        set([]);
-      }
-    },
-    [] as Room[]
-  );
-
-  const topics = derived(
-    floors,
-    (floors, set) => {
-      if (floors) {
-        let topicIds = [] as string[];
-        for (const floor of floors) {
-          topicIds = topicIds.concat(
-            (floor.relationships.topics.data as JsonApiObjectReference[]).map(
-              (rel) => {
-                return rel.id;
-              }
-            )
-          );
-        }
-        loadTopics(topicIds).then((topics) => {
-          const topicsMap = {} as { [x: string]: JsonApiObject[] };
-          for (const floor of floors) {
-            topicIds = (
-              floor.relationships.topics.data as JsonApiObjectReference[]
-            ).map((rel) => {
-              return rel.id;
-            });
-            topicsMap[floor.id] = topics.filter((topic) => {
-              return topicIds.indexOf(topic.id) >= 0;
-            });
-          }
-          set(topicsMap);
-          if (floorListElement) {
-            tick().then(() => {
-              const currentElement = floorListElement.querySelector(
-                ".current-floor"
-              ) as HTMLElement;
-              if (currentElement) {
-                currentElement.scrollIntoView();
-              }
-            });
-          }
-        });
-      }
-    },
-    {} as { [x: string]: JsonApiObject[] }
-  );
-
-  const searchedFloors = derived(
-    [floors, matchingFloors],
-    ([floors, matchingFloors]) => {
-      return floors.map((floor: JsonApiObject) => {
-        return [floor, matchingFloors.indexOf(floor.id) >= 0];
-      });
-    },
-    [] as [JsonApiObject, boolean][]
-  );
-
-  const searchedRooms = derived(
-    [rooms, matchingRooms],
-    ([rooms, matchingRooms]) => {
-      return rooms.map((room) => {
-        return [room, matchingRooms.indexOf(room.id) >= 0];
-      });
-    },
-    [] as [JsonApiObject, boolean][]
-  );
-
   onMount(() => {
     document.body.addEventListener("mousemove", (ev: MouseEvent) => {
       mousePosition.x = ev.pageX;
@@ -609,10 +589,10 @@
 
 <div class="flex flex-col h-screen">
   <Header
-    title={$currentFloor ? $currentFloor.attributes.label : "Loading..."}
+    title={$currentFloor ? $currentFloor.label : "Loading..."}
     nav={[
       {
-        label: $currentFloor ? $currentFloor.attributes.label : "Loading...",
+        label: $currentFloor ? $currentFloor.label : "Loading...",
         path: "/floor/" + ($currentFloor ? $currentFloor.id : "0"),
       },
     ]}
@@ -626,27 +606,27 @@
           on:mouseenter={() => {
             tracker.log({
               action: "mouseenter",
-              params: { object: "previous-floor", floor: $previousFloor.id },
+              params: { object: "previous-floor", floor: $previousFloor?.id },
             });
           }}
           on:mouseleave={() => {
             tracker.log({
               action: "mouseleave",
-              params: { object: "previous-floor", floor: $previousFloor.id },
+              params: { object: "previous-floor", floor: $previousFloor?.id },
             });
           }}
           on:focus={() => {
             tracker.log({
               action: "focus",
-              params: { object: "previous-floor", floor: $previousFloor.id },
+              params: { object: "previous-floor", floor: $previousFloor?.id },
             });
           }}
           on:blur={() => {
             tracker.log({
               action: "blur",
-              params: { object: "previous-floor", floor: $previousFloor.id },
+              params: { object: "previous-floor", floor: $previousFloor?.id },
             });
-          }}>⇧ {$previousFloor.attributes.label}</a
+          }}>⇧ {$previousFloor.label}</a
         >
       {:else}
         <span class="inline-block px-4 py-3 lg:py-2 rounded-lg">&nbsp;</span>
@@ -704,7 +684,7 @@
             <a
               href="#/floor/{floor.id}"
               class="mb-4 block group hover:underline {floor.id ===
-              $currentFloor.id
+              $currentFloor?.id
                 ? 'current-floor'
                 : ''}"
               on:mouseenter={() => {
@@ -745,17 +725,17 @@
               }}
             >
               <span
-                class="inline-block {floor.id === $currentFloor.id
+                class="inline-block {floor.id === $currentFloor?.id
                   ? 'bg-blue-600'
                   : 'bg-neutral-600'} px-4 lg:px-3 py-3 lg:py-1 rounded-lg lg:underline-offset-2 lg:hover:bg-blue-800 lg:focus:bg-blue-800 lg:group-hover:bg-blue-800 lg:group-focus:bg-blue-800"
-                >⇒ {floor.attributes.label}</span
+                >⇒ {floor.label}</span
               >
               <span class="flex flex-row flex-wrap text-sm pl-4 pt-2">
-                {#if $topics[floor.id]}
-                  {#each $topics[floor.id] as topic}
+                {#if $topicsDict[floor.id]}
+                  {#each $topicsDict[floor.id] as topic}
                     <span
                       class="after:content-[','] after:mr-1 last:after:hidden"
-                      >{topic.attributes.label}</span
+                      >{topic.label}</span
                     >
                   {/each}
                 {/if}
@@ -819,7 +799,7 @@
           <h3
             class="truncate block px-2 py-1 hover:underline focus:underline bg-blue-800 text-white"
           >
-            {$hoverRoom.attributes.label}
+            {$hoverRoom.label}
           </h3>
           <ul class="flex-1 flex flex-col overflow-hidden px-2 py-2">
             {#each $samples as sample}
@@ -836,7 +816,7 @@
             <a
               href="#/room/{$hoverRoom.id}"
               class="flex-1 truncate block hover:underline focus:underline"
-              >{$hoverRoom.attributes.label}</a
+              >{$hoverRoom.label}</a
             >
             <button
               on:click={() => {
@@ -871,7 +851,7 @@
                 : ''}"
             >
               <a
-                href="#/room/{room.id}"
+                href="#/floor/{$currentFloor?.id}/room/{room.id}"
                 class="flex-1 block py-2 hover:underline focus:underline"
                 on:mouseenter={() => {
                   tracker.log({
@@ -908,7 +888,7 @@
                       floor: room.id,
                     },
                   });
-                }}>{room.attributes.label}</a
+                }}>{room.label}</a
               >
             </li>
           {/each}
@@ -924,27 +904,27 @@
         on:mouseenter={() => {
           tracker.log({
             action: "mouseenter",
-            params: { object: "next-floor", floor: $nextFloor.id },
+            params: { object: "next-floor", floor: $nextFloor?.id },
           });
         }}
         on:mouseleave={() => {
           tracker.log({
             action: "mouseleave",
-            params: { object: "next-floor", floor: $nextFloor.id },
+            params: { object: "next-floor", floor: $nextFloor?.id },
           });
         }}
         on:focus={() => {
           tracker.log({
             action: "focus",
-            params: { object: "next-floor", floor: $nextFloor.id },
+            params: { object: "next-floor", floor: $nextFloor?.id },
           });
         }}
         on:blur={() => {
           tracker.log({
             action: "blur",
-            params: { object: "next-floor", floor: $nextFloor.id },
+            params: { object: "next-floor", floor: $nextFloor?.id },
           });
-        }}>⇩ {$nextFloor.attributes.label}</a
+        }}>⇩ {$nextFloor.label}</a
       >
     {:else}
       <span
diff --git a/museum_map/server/frontend/src/routes/Item.svelte b/museum_map/server/frontend/src/routes/Item.svelte
index 29e1e3e..b5073f8 100644
--- a/museum_map/server/frontend/src/routes/Item.svelte
+++ b/museum_map/server/frontend/src/routes/Item.svelte
@@ -4,14 +4,7 @@
   import { location } from "../simple-svelte-router";
 
   import Thumbnail from "../components/Thumbnail.svelte";
-  import {
-    cachedItems,
-    rooms,
-    loadItems,
-    fetchRooms,
-    config,
-    tracker,
-  } from "../store";
+  import { items, rooms, fetchRooms, config, tracker } from "../store";
 
   let itemHeading: HTMLElement | null = null;
 
diff --git a/museum_map/server/frontend/src/routes/Room.svelte b/museum_map/server/frontend/src/routes/Room.svelte
index 4d63086..e1c90bf 100644
--- a/museum_map/server/frontend/src/routes/Room.svelte
+++ b/museum_map/server/frontend/src/routes/Room.svelte
@@ -7,75 +7,15 @@
   import Footer from "../components/Footer.svelte";
   import Thumnail from "../components/Thumbnail.svelte";
   import Item from "./Item.svelte";
-  import {
-    floors,
-    rooms,
-    fetchRooms,
-    cachedItems,
-    loadItems,
-    matchingItems,
-  } from "../store";
+  import { currentFloor, currentRoom, currentItems } from "../store";
 
-  const currentRoom = derived(
-    [location, cachedRooms],
-    ([location, cachedRooms]) => {
-      if (!cachedRooms[location.pathComponents[1]]) {
-        loadRooms([location.pathComponents[1]]);
-      }
-      return cachedRooms[location.pathComponents[1]];
-    },
-    null
-  );
-
-  const currentFloor = derived(
-    [currentRoom, floors],
-    ([currentRoom, floors]) => {
-      if (currentRoom) {
-        const floor = floors.filter((floor) => {
-          return (
-            floor.id ===
-            (currentRoom.relationships.floor.data as JsonApiObjectReference).id
-          );
-        });
-        if (floor.length > 0) {
-          return floor[0];
-        }
-      }
-      return null;
-    },
-    null
-  );
-
-  const items = derived(
-    [currentRoom, cachedItems, matchingItems],
-    ([currentRoom, cachedItems, matchingItems]) => {
-      if (currentRoom) {
-        let itemIds = (
-          currentRoom.relationships.items.data as JsonApiObjectReference[]
-        ).map((ref) => {
-          return ref.id;
-        });
-        let items = itemIds
-          .map((id) => {
-            return cachedItems[id];
-          })
-          .filter((item) => {
-            return item;
-          })
-          .map((item) => {
-            return [item, matchingItems.indexOf(item.id) >= 0];
-          });
-        if (itemIds.length != items.length) {
-          loadItems(itemIds);
-        }
-        return items;
-      }
-      return [];
-    },
-    []
-  );
+  const matchedItems = derived(currentItems, (currentItems) => {
+    return currentItems.map((item) => {
+      return [item, false];
+    });
+  });
 
-  const unsubscribeItems = items.subscribe((items) => {
+  const unsubscribeItems = currentItems.subscribe((currentItems) => {
     tick().then(() => {
       focusFirstMatch(true);
     });
@@ -96,8 +36,7 @@
         block: "center",
         behavior: smooth ? "smooth" : "auto",
       });
-    }
-    if ($location.pathComponents.length === 2) {
+    } else {
       const element = document.querySelector("h1");
       if (element) {
         (element as HTMLElement).focus();
@@ -117,15 +56,15 @@
 
 {#if $currentRoom && $currentFloor}
   <Header
-    title={$currentRoom.attributes.label}
+    title={$currentRoom.label}
     nav={[
       {
-        label: $currentFloor.attributes.label,
+        label: $currentFloor.label,
         path: "/floor/" + $currentFloor.id,
       },
       {
-        label: $currentRoom.attributes.label,
-        path: "/room/" + $currentRoom.id,
+        label: $currentRoom.label,
+        path: "/floor/" + $currentFloor.id + "/room/" + $currentRoom.id,
       },
     ]}
   />
@@ -133,7 +72,7 @@
     <ul
       class="grid grid-cols-1 md:grid-cols-items justify-around p-4 overflow-hidden"
     >
-      {#each $items as [item, matches]}
+      {#each $matchedItems as [item, matches]}
         <li
           class="p-4 mb-3 {matches
             ? 'bg-blue-600 rounded-lg data-matching'
@@ -143,7 +82,9 @@
         </li>
       {/each}
     </ul>
-    <Route path="/room/:rid/:iid" handleFocus={false}><Item /></Route>
+    <Route path="/floor/:fid/room/:rid/item/:iid" handleFocus={false}
+      ><Item /></Route
+    >
   </article>
   <Footer />
 {/if}
diff --git a/museum_map/server/frontend/src/store/floors.ts b/museum_map/server/frontend/src/store/floors.ts
index 279942d..33c8486 100644
--- a/museum_map/server/frontend/src/store/floors.ts
+++ b/museum_map/server/frontend/src/store/floors.ts
@@ -1,4 +1,5 @@
-import { writable, derived } from 'svelte/store';
+import { derived } from 'svelte/store';
+import { location } from '../simple-svelte-router';
 
 import { busyCounter } from './busy';
 import { isReady } from './status';
@@ -26,6 +27,18 @@ export const floors = DependentStore<null | Floor[], boolean>([], async (isReady
   }
 }, isReady);
 
+// The current floor or null for the lobby
+export const currentFloor = derived([floors, location], ([floors, location]) => {
+  if (location.pathComponents.fid && floors) {
+    for (let floor of floors) {
+      if (floor.id === Number.parseInt(location.pathComponents.fid)) {
+        return floor;
+      }
+    }
+  }
+  return null;
+});
+
 // The list of all floor topics
 export const floorTopics = DependentStore<null | FloorTopic[], boolean>(null, async (isReady) => {
   if (isReady) {
diff --git a/museum_map/server/frontend/src/store/index.ts b/museum_map/server/frontend/src/store/index.ts
index d85b191..2b2d3ae 100644
--- a/museum_map/server/frontend/src/store/index.ts
+++ b/museum_map/server/frontend/src/store/index.ts
@@ -1,8 +1,8 @@
 import { busyCounter, isBusy } from './busy';
 import { itemOfTheDay, randomItemsSelection } from './picks';
-import { floorTopics, majorCollections, floors } from './floors';
-import { rooms, fetchRooms } from './rooms';
-import { cachedItems, loadItems } from './items';
+import { floorTopics, majorCollections, floors, currentFloor } from './floors';
+import { rooms, fetchRooms, currentRooms, currentRoom } from './rooms';
+import { items, fetchItems, currentItems, currentItem } from './items';
 import { config, fetchConfig } from './config';
 import { cachedTopics, loadTopics } from './topics';
 import { localPreferences } from './preferences';
@@ -22,12 +22,17 @@ export {
     floorTopics,
     majorCollections,
     floors,
+    currentFloor,
 
+    currentRoom,
+    currentRooms,
     rooms,
     fetchRooms,
 
-    cachedItems,
-    loadItems,
+    items,
+    fetchItems,
+    currentItems,
+    currentItem,
 
     cachedTopics,
     loadTopics,
diff --git a/museum_map/server/frontend/src/store/items.ts b/museum_map/server/frontend/src/store/items.ts
index 3094719..c0939dc 100644
--- a/museum_map/server/frontend/src/store/items.ts
+++ b/museum_map/server/frontend/src/store/items.ts
@@ -1,16 +1,85 @@
-import { writable, get } from 'svelte/store';
+import deepcopy from "deepcopy";
+import { writable, derived } from 'svelte/store';
+import { location } from "../simple-svelte-router";
 
 import { busyCounter } from './busy';
+import { currentRoom } from "./rooms";
 
-const activeQueries = [];
+let itemsIdQueryCache: number[] = [];
+let itemsQueryPromise: Promise<Room[]> | null = null;
 
-export const cachedItems = writable({} as {[x: string]: JsonApiObject});
+export async function fetchItems(itemIds: number[]): Promise<Room[]> {  // TODO: Filter existing items for caching
+  if (itemsQueryPromise === null) {
+    itemsIdQueryCache = deepcopy(itemIds);
+    itemsQueryPromise = new Promise<Room[]>((resolve) => {
+      setTimeout(async () => {
+        try {
+          busyCounter.start();
+          const fetchitemIds = itemsIdQueryCache;
+          itemsIdQueryCache = [];
+          itemsQueryPromise = null;
+          const response = await window.fetch("/api/items/?" + fetchitemIds.map((id) => { return "iid=" + id }).join("&"));
+          if (response.status === 200) {
+            const newitems = await response.json() as Room[];
+            items.update((items) => {
+              for (let room of newitems) {
+                items[room.id] = room;
+              }
+              return items;
+            })
+            resolve(newitems);
+          } else {
+            resolve([]);
+          }
+        } finally {
+          busyCounter.stop();
+        }
+      }, 5);
+    });
+  } else {
+    itemsIdQueryCache = itemsIdQueryCache.concat(itemIds);
+  }
+  return itemsQueryPromise;
+}
+
+export const items = writable({} as { [x: number]: Room });
+
+export const currentItems = derived([items, currentRoom], ([items, currentRoom]) => {
+  if (currentRoom) {
+    return currentRoom.items.map((itemId) => {
+      if (items[itemId]) {
+        return items[itemId];
+      } else {
+        fetchItems([itemId]);
+        return null;
+      }
+    }).filter((room) => {
+      return room !== null;
+    }) as Room[];
+  }
+  return [];
+});
+
+export const currentItem = derived([items, location], ([items, location]) => {
+  if (location.pathComponents.iid) {
+    if (items[Number.parseInt(location.pathComponents.iid)]) {
+      return items[Number.parseInt(location.pathComponents.iid)];
+    } else {
+      fetchItems([Number.parseInt(location.pathComponents.iid)]);
+    }
+  }
+  return null;
+});
+
+/*const activeQueries = [];
+
+export const cachedItems = writable({} as { [x: string]: JsonApiObject });
 
 export async function loadItems(itemIds: string[]): Promise<JsonApiObject[]> {
     const $cachedItems = get(cachedItems);
-    const missingIds = itemIds.filter((id) => { return !$cachedItems[id]});
+    const missingIds = itemIds.filter((id) => { return !$cachedItems[id] });
     if (missingIds.length > 0) {
-        const url = '/api/items?filter[id]=' + missingIds.map((id) => { return id}).join(',');
+        const url = '/api/items?filter[id]=' + missingIds.map((id) => { return id }).join(',');
         if (activeQueries.indexOf(url) < 0) {
             busyCounter.start();
             activeQueries.push(url);
@@ -28,3 +97,4 @@ export async function loadItems(itemIds: string[]): Promise<JsonApiObject[]> {
     }
     return itemIds.map((id) => { return $cachedItems[id]; });
 }
+*/
diff --git a/museum_map/server/frontend/src/store/rooms.ts b/museum_map/server/frontend/src/store/rooms.ts
index 9281c17..4a37760 100644
--- a/museum_map/server/frontend/src/store/rooms.ts
+++ b/museum_map/server/frontend/src/store/rooms.ts
@@ -1,9 +1,9 @@
 import deepcopy from "deepcopy";
-import { writable, get } from 'svelte/store';
+import { writable, derived } from 'svelte/store';
+import { location } from "../simple-svelte-router";
 
 import { busyCounter } from './busy';
-
-export const rooms = writable({} as { [x: number]: Room });
+import { currentFloor } from "./floors";
 
 let roomsIdQueryCache: number[] = [];
 let roomsQueryPromise: Promise<Room[]> | null = null;
@@ -40,15 +40,33 @@ export async function fetchRooms(roomIds: number[]): Promise<Room[]> {  // TODO:
     roomsIdQueryCache = roomsIdQueryCache.concat(roomIds);
   }
   return roomsQueryPromise;
-  /*    try {
-          busyCounter.start();
-          const response = await window.fetch("/api/rooms/?" + roomIds.map((id) => { return "rid=" + id }).join("&"));
-          if (response.status === 200) {
-              return await response.json() as Room[];
-          } else {
-              return [];
-          }
-      } finally {
-          busyCounter.stop();
-      }*/
 }
+
+export const rooms = writable({} as { [x: number]: Room });
+
+export const currentRooms = derived([rooms, currentFloor], ([rooms, currentFloor]) => {
+  if (currentFloor) {
+    return currentFloor.rooms.map((roomId) => {
+      if (rooms[roomId]) {
+        return rooms[roomId];
+      } else {
+        fetchRooms([roomId]);
+        return null;
+      }
+    }).filter((room) => {
+      return room !== null;
+    }) as Room[];
+  }
+  return [];
+});
+
+export const currentRoom = derived([rooms, location], ([rooms, location]) => {
+  if (location.pathComponents.rid) {
+    if (rooms[Number.parseInt(location.pathComponents.rid)]) {
+      return rooms[Number.parseInt(location.pathComponents.rid)];
+    } else {
+      fetchRooms([Number.parseInt(location.pathComponents.rid)]);
+    }
+  }
+  return null;
+});