diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index de517ce..83dfa92 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -1,24 +1,102 @@
 pis:
   - code: 5001
     stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5002
+    stops: [avn,shh,sml,cfn,mtp,rda,srd,lwh,bri,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5003
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5004
+    stops: [bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5005
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5013
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5014
+    stops: [bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5015
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5016
+    stops: [bri,bmt,nls,yat,wor,wnm,wsm]
   - code: 5017
     stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5018
+    stops: [bpw,fit,bri]
+  - code: 5019
+    stops: [bpw,fit,srd,bri]
+  - code: 5020
+    stops: [bpw,fit,srd,lwh,bri]
   - code: 5032
     stops: [cdf,nwp,stj,pwy,fit,srd,lwh,bri]
   - code: 5038
     stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5047
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri]
+  - code: 5052
+    stops: [wsb,fro,bru,clc,tau,tvp,exd]
   - code: 5053
     stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn]
   - code: 5055
     stops: [bri,lwh,srd,fit,bpw]
+  - code: 5059
+    stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,svb]
   - code: 5060
     stops: [bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5075
+    stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bwt,bri]
+  - code: 5076
+    stops: [tau,bwt,hig,wsm,wor,yat,nls,bri]
+  - code: 5077
+    stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bmt,bri]
+  - code: 5078
+    stops: [tau,bmt,hig,wsm,wnm,wor,yat,nls,bri,lwh,srd,fit,bpw]
+  - code: 5079
+    stops: [tau,bmt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,fit,bpw] # Check for LWH and SRD
+  - code: 5080
+    stops: [tau,bmt,hig,wsm,wor,yat,nls,bri,lwh,srd,fit,bpw]
+  - code: 5081
+    stops: [tau,bmt,hig,wsm,wor,yat,nls,psn,bri,lwh,srd,fit,bpw]
   - code: 5092
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
   - code: 5124
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wnm,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5128
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5129
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5130
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5131
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5132
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5133
+    stops: [cdf,nwp,stj,fit,bri,bth,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5134
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5135
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5136
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5137
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5164
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,nwp,cdf]
+  - code: 5165
+    stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,stj,nwp,cdf]
+  - code: 5166
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5167
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw]
+  - code: 5168
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,wsb,tro,boa,avf,ffd,bth,bri,fit,bpw]
+  - code: 5169
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5170
+    stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,olf,kyn,bri,fit,bpw]
+  - code: 5171
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,bpw]
+  - code: 5172
+    stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,wsb,tro,boa,bth,bri,fit,bpw]
   - code: 5184
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb,tro,boa,bth,bri,fit,stj,nwp,cdf]
   - code: 5185
@@ -27,12 +105,48 @@ pis:
     stops: [pmh,pms,ftn,frm,esl,soa,sou,rom,sal,wnm,dmh,wsb]
   - code: 5187
     stops: [pmh,pms,ftn,frm,sou,rom,sal,wnm,dmh,wsb]
+  - code: 5188
+    stops: [sal,wmn,dmh,wsb]
+  - code: 5196
+    stops: [wmn,dmh,wsb]
+  - code: 5200
+    stops: [gcr,cnm]
   - code: 5215
     stops: [bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
+  - code: 5223
+    stops: [bpw,srd,lwh,bri,kyn,olf,bth,ffd,avn,boa,tro,wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
+  - code: 5238
+    stops: [wsb,fro,bru,clc,yvp,tho,yet,cno,mdn,dcw,upw,wey]
   - code: 5248
     stops: [wey,upw,dcw,mdn,cno,yet,tho,yvp,clc,bru,fro,wsb,tro,boa,avn,ffd,bth,olf,kyn,bri] # [reverse,5215]
+  - code: 5254
+    stops: [reverse,5248]
+  - code: 5225
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri]
+  - code: 5226
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,cdu,yae,bpw,fit,srd,lwh,bri]
+  - code: 5231
+    stops: [wos,asc,cnm,gcr,bpw,bri]
+  - code: 5232
+    stops: [wos,asc,cmn,gcr,cdu,yae,bpw,fit,bri]
+  - code: 5237
+    stops: [wsb,fro]
+  - code: 5240
+    stops: [bri,fit,bpw,yae,cdu,gcr,cnm]
+  - code: 5241
+    stops: [bri,fit,bpw,yae,cdu,gcr]
+  - code: 5242
+    stops: [bri,fit,bpw,yae,cdu,gcr,cnm,asc,wos]
+  - code: 5256
+    stops: [wsb,tro,boa,bth]
+  - code: 5257
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
+  - code: 5258
+    stops: [wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,bpw]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
+  - code: 5499
+    stops: [bth,olf,kyn,bri,lwh,srd,fit]
   - code: 5502
     stops: [bri,lwh,srd,fit]
   - code: 5513
@@ -41,6 +155,10 @@ pis:
     stops: [fit,srd,lwh,bri] # [reverse,5513]
   - code: 5533
     stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
+  - code: 5542
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5561
+    stops: [tau,bwt,hig,wsm,wnm,wor,yat,nls,psn,bmt,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 5866
     stops: [sal,wmn,dmh,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri]
   - code: 6067