diff --git a/lib/functions/buildLocationList.nix b/lib/functions/buildLocationList.nix
deleted file mode 100644
index 012706c..0000000
--- a/lib/functions/buildLocationList.nix
+++ /dev/null
@@ -1 +0,0 @@
-locations: builtins.attrNames locations
diff --git a/lib/functions/location.nix b/lib/functions/location.nix
new file mode 100644
index 0000000..0bd8db1
--- /dev/null
+++ b/lib/functions/location.nix
@@ -0,0 +1,9 @@
+{ data, lib }:
+
+let
+  mkLocationsList = locations: builtins.attrNames locations;
+  mkLocationIndex = data: location: lib.lists.findFirstIndex (x: x == location) null (mkLocationsList data);
+in
+{
+  inherit mkLocationsList mkLocationIndex;
+}
diff --git a/test/test-buildLocationList.nix b/test/test-buildLocationList.nix
deleted file mode 100644
index 855d45c..0000000
--- a/test/test-buildLocationList.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  buildLocationList = import ../lib/functions/buildLocationList.nix;
-  sampleData = import ./meta.nix;
-in
-{
-  result = buildLocationList sampleData.locations;
-}
diff --git a/test/test-location.nix b/test/test-location.nix
new file mode 100644
index 0000000..1fd8bda
--- /dev/null
+++ b/test/test-location.nix
@@ -0,0 +1,11 @@
+let
+  nixpkgs = import <nixpkgs> { };
+  sampleData = import ./meta.nix;
+  locationLib = import ../lib/functions/location.nix {
+    data = sampleData;
+    lib = nixpkgs.lib;
+  };
+in
+{
+  result = locationLib.mkLocationIndex sampleData.locations "home";
+}