diff --git a/index.ts b/index.ts
index 1baa1f77c..b395381e7 100644
--- a/index.ts
+++ b/index.ts
@@ -3,7 +3,7 @@ import {Changes} from "./Logic/Changes";
 import {ElementStorage} from "./Logic/ElementStorage";
 import {UIEventSource} from "./UI/UIEventSource";
 import {UserBadge} from "./UI/UserBadge";
-import {Basemap} from "./Logic/Basemap";
+import {Basemap, BaseLayers} from "./Logic/Basemap";
 import {PendingChanges} from "./UI/PendingChanges";
 import {CenterMessageBox} from "./UI/CenterMessageBox";
 import {Helpers} from "./Helpers";
@@ -334,4 +334,16 @@ const openFilterButton = `
 
 new CheckBox(new Combine([new LayerSelection(flayers), openFilterButton]), closedFilterButton).AttachTo("filter__selection")
 
-        
\ No newline at end of file
+// --------------- Setting up basemap dropdown --------
+
+let baseLayerOptions = [];
+
+Object.entries(BaseLayers.baseLayers).forEach(([key, value], i) => {
+console.log(key, value, i);
+    baseLayerOptions.push({value: {name: key, layer: value}, shown: key});
+});
+
+console.log(bm.CurrentLayer.data);
+
+
+new DropDown(`label`, baseLayerOptions, bm.CurrentLayer).AttachTo("filter__selection");
\ No newline at end of file
diff --git a/test.ts b/test.ts
index 51ad56bcf..15d721fd6 100644
--- a/test.ts
+++ b/test.ts
@@ -1,32 +1,14 @@
-import {DropDown} from "./UI/Input/DropDown";
-import Locale from "./UI/i18n/Locale";
-import Combine from "./UI/Base/Combine";
-import Translations from "./UI/i18n/Translations";
-import {TagRenderingOptions} from "./Customizations/TagRendering";
-import {UIEventSource} from "./UI/UIEventSource";
-import {Tag} from "./Logic/TagsFilter";
-import {Changes} from "./Logic/Changes";
-import {OsmConnection} from "./Logic/OsmConnection";
-import Translation from "./UI/i18n/Translation";
+import { DropDown } from "./UI/Input/DropDown";
+import { BaseLayers, Basemap } from "./Logic/Basemap";
 
-console.log("Hello world")
-Locale.language.setData("en");
-let languagePicker = new DropDown("", ["en", "nl"].map(lang => {
-        return {value: lang, shown: lang}
-    }
-), Locale.language).AttachTo("maindiv");
+let baseLayerOptions = [];
+
+Object.entries(BaseLayers.baseLayers).forEach(([key, value], i) => {
+// console.log(key, value, i);
+    baseLayerOptions.push({value: i, shown: key});
+});
+
+console.log(Basemap);
 
 
-let tags = new UIEventSource({
-    x:"y"
-})
-
-new TagRenderingOptions({
-    mappings: [{k: new Tag("x","y"), txt: new Translation({en: "ENG", nl: "NED"})}]
-}).construct({
-    tags: tags,
-    changes: new Changes(
-        "cs",
-        new OsmConnection(true)
-    )
-}).AttachTo("extradiv")
\ No newline at end of file
+new DropDown(`label`, baseLayerOptions, Basemap.CurrentLayer).AttachTo("maindiv");
\ No newline at end of file