OK for now but I guess in the future we might have to do something a bit smarter re what we discussed yesterday (better links like rti:bus, rti:train-arrivals, rti:train-departures etc), rather than based on type?