diff --git a/modules/tfl.py b/modules/tfl.py
index f2036bca..88c70587 100644
--- a/modules/tfl.py
+++ b/modules/tfl.py
@@ -7,6 +7,9 @@ URL_BUS_SEARCH = "https://api.tfl.gov.uk/StopPoint/Search/%s"
 URL_LINE = "https://api.tfl.gov.uk/Line/Mode/tube/Status"
 LINE_NAMES = ["bakerloo", "central", "circle", "district", "hammersmith and city", "jubilee", "metropolitan", "piccadilly", "victoria", "waterloo and city"]
 
+URL_STOP = "https://api.tfl.gov.uk/StopPoint/%s"
+URL_STOP_SEARCH = "https://api.tfl.gov.uk/StopPoint/Search/%s"
+
 class Module(object):
     _name = "TFL"
     def __init__(self, bot):
@@ -19,6 +22,10 @@ class Module(object):
             ).hook(self.line,
             help="Get line status for TfL underground lines",
             usage="<line_name>")
+        bot.events.on("received").on("command").on("tflstop"
+            ).hook(self.stop, min_args=1,
+            help="Get a list of TfL stop IDs for a given name",
+            usage="<name>")
 
     def bus(self, event):
         app_id = self.bot.config["tfl-api-id"]
@@ -27,48 +34,58 @@ class Module(object):
         target_bus_route = None
         if len(event["args_split"]) > 1:
             target_bus_route = event["args_split"][1].lower()
+
+        bus_stop = None
+        real_stop_id = ""
+        stop_name = ""
         if stop_id.isdigit():
             bus_search = Utils.get_url(URL_BUS_SEARCH % stop_id, get_params={
                 "app_id": app_id, "app_key": app_key}, json=True)
-            if bus_search["matches"]:
-                bus_stop = bus_search["matches"][0]
-                real_stop_id = bus_stop["id"]
-                stop_name = bus_stop["name"]
-                bus_stop = Utils.get_url(URL_BUS % real_stop_id, get_params={
-                    "app_id": app_id, "app_key": app_key}, json=True)
-                busses = []
-                for bus in bus_stop:
-                    bus_number = bus["lineName"]
-                    bus_due_iso8601 = bus["expectedArrival"]
-                    bus_due = datetime.datetime.strptime(bus_due_iso8601,
-                        "%Y-%m-%dT%H:%M:%SZ")
-                    time_until = bus_due-datetime.datetime.utcnow()
-                    time_until = int(time_until.total_seconds()/60)
-                    busses.append([bus_number, time_until])
-                if busses:
-                    busses = sorted(busses, key=lambda b: b[-1])
-                    busses_formatted = collections.OrderedDict()
-                    for bus_route, time_until in busses:
-                        if bus_route in busses_formatted:
-                            continue
-                        if time_until == 0:
-                            time_until = "due"
-                        elif time_until == 1:
-                            time_until = "in 1 minute"
-                        else:
-                            time_until = "in %d minutes" % time_until
-                        if not target_bus_route or bus_route.lower() == target_bus_route:
-                            busses_formatted[bus_route] = time_until
-                    busses_string = ", ".join(["%s (%s)" % (bus_route, time_until
-                        ) for bus_route, time_until in busses_formatted.items()])
-                    event["stdout"].write("%s (%s): %s" % (stop_name, stop_id,
-                        busses_string))
-                else:
-                    event["stderr"].write("%s: No busses due" % stop_id)
-            else:
-                event["stderr"].write("Bus ID '%s' unknown" % stop_id)
+            bus_stop = bus_search["matches"][0]
+            real_stop_id = bus_stop["id"]
+            stop_name = bus_stop["name"]
         else:
-            event["stderr"].write("Please provide a numeric bus stop ID")
+            bus_stop = Utils.get_url(URL_STOP % stop_id, get_params={
+                "app_id": app_id, "app_key": app_key}, json=True)
+            if bus_stop:
+                real_stop_id = stop_id
+                stop_name = bus_stop["commonName"]
+
+        if real_stop_id:
+            bus_stop = Utils.get_url(URL_BUS % real_stop_id, get_params={
+                "app_id": app_id, "app_key": app_key}, json=True)
+            print(bus_stop)
+            busses = []
+            for bus in bus_stop:
+                bus_number = bus["lineName"]
+                bus_due_iso8601 = bus["expectedArrival"]
+                bus_due = datetime.datetime.strptime(bus_due_iso8601.split(".")[0],
+                    "%Y-%m-%dT%H:%M:%S")
+                time_until = bus_due-datetime.datetime.utcnow()
+                time_until = int(time_until.total_seconds()/60)
+                busses.append([bus_number, time_until])
+            if busses:
+                busses = sorted(busses, key=lambda b: b[-1])
+                busses_formatted = collections.OrderedDict()
+                for bus_route, time_until in busses:
+                    if bus_route in busses_formatted:
+                        continue
+                    if time_until == 0:
+                        time_until = "due"
+                    elif time_until == 1:
+                        time_until = "in 1 minute"
+                    else:
+                        time_until = "in %d minutes" % time_until
+                    if not target_bus_route or bus_route.lower() == target_bus_route:
+                        busses_formatted[bus_route] = time_until
+                busses_string = ", ".join(["%s (%s)" % (bus_route, time_until
+                    ) for bus_route, time_until in busses_formatted.items()])
+                event["stdout"].write("%s (%s): %s" % (stop_name, stop_id,
+                    busses_string))
+            else:
+                event["stderr"].write("%s: No busses due" % stop_id)
+        else:
+           event["stderr"].write("Bus ID '%s' unknown" % stop_id)
 
     def line(self, event):
         app_id = self.bot.config["tfl-api-id"]
@@ -108,3 +125,17 @@ class Module(object):
             event["stdout"].write(result[:-2])
         else:
             event["stderr"].write("No results")
+
+    def stop(self, event):
+        app_id = self.bot.config["tfl-api-id"]
+        app_key = self.bot.config["tfl-api-key"]
+        stop_name = event["args"]
+        print(URL_STOP_SEARCH % stop_name)
+        stop_search = Utils.get_url(URL_STOP_SEARCH % stop_name, get_params={
+            "app_id": app_id, "app_key": app_key, "maxResults": "4", "faresOnly": "False"}, json=True)
+        print(stop_search)
+        for stop in stop_search["matches"]:
+            print(stop)
+
+        results = ["%s (%s): %s" % (stop["name"], ", ".join(stop["modes"]), stop["id"]) for stop in stop_search["matches"]]
+        event["stdout"].write("; ".join(results))