diff --git a/data/pis/gwr.yaml b/data/pis/gwr.yaml
index addeeff..9a6c179 100644
--- a/data/pis/gwr.yaml
+++ b/data/pis/gwr.yaml
@@ -127,8 +127,60 @@ pis:
     stops: [tau,bwt,hig,wsm,wor,yat,nls,psn,bri,lwh,srd,fit,bpw]
   - code: 5092
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri]
+  - code: 5101
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
+  - code: 5102
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5103
+    stops: [bpw,btn] # No longer used so intermediate stops omitted
+  - code: 5104
+    stops: [bpw,btn] # No longer used so intermediate stops omitted
+  - code: 5105
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5106
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5107
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5108
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5109
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5110
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5111
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5112
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5113
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5114
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5115
+    stops: [bpw,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5116
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn]
+  - code: 5117
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn]
+  - code: 5118
+    stops: [cnm,gcr,cdu,yae,bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5119
+    stops: [cdf,btn]  # No longer used so intermediate stops omitted
+  - code: 5120
+    stops: [cdf,btn]  # No longer used so intermediate stops omitted
+  - code: 5121
+    stops: [cdf,btn]  # No longer used so intermediate stops omitted
+  - code: 5122
+    stops: [cdf,nwp,stj,fit,bri]
+  - code: 5123
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5124
     stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wnm,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5125
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wnm,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5126
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 5127
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftm,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
@@ -149,6 +201,32 @@ pis:
     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: 5139
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5140
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5141
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5142
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,boa,tro,wsb,dmh,wmn]
+  - code: 5143
+    stops: [cdf,nwp,stj,pwy,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
+  - code: 5144
+    stops: [gmv,btn]  # No longer in use, intermittent stops omitted
+  - code: 5145
+    stops: [gmv,btn]  # No longer in use, intermittent stops omitted
+  - code: 5146
+    stops: [pmh,btn]  # No longer in use, intermittent stops omitted
+  - code: 5147
+    stops: [rom,btn]  # No longer in use, intermittent stops omitted
+  - code: 5148
+    stops: [wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5149
+    stops: [wsb,wmn,sal]
+  - code: 5150
+    stops: [wsb,dmh,wmn,sal,rom,sou]
+  - code: 5151
+    stops: [wsb,dmh,wmn]
   - code: 5164
     stops: [fro,wsb,tro,boa,avf,ffd,bth,olf,kyn,bri,fit,pwy,nwp,cdf]
   - code: 5165
@@ -217,6 +295,22 @@ pis:
     stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5437
     stops: [bri,wsm,tau,tvp,exd,ext,dwl,tgm,nta,tot,ivy,ply,lsk,bod,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 5443
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,ffd,boa,tro,wsb,dmh,wmn]
+  - code: 5446
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5447
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5448
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5449
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5450
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5451
+    stops: [cdf,nwp,stj,fir,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5452
+    stops: [cdf,nwp,stj,fir,bri,kyn,olf,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5487
     stops: [wsm,wnm,wor,yat,nls,psn,bmt,bri,lwh,srd,mtp,rda,cfn,sml,shh,avn,sar,svb]
   - code: 5488
@@ -225,6 +319,10 @@ pis:
     stops: [avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5490
     stops: [bri,tau,tvp,exd]
+  - code: 5491
+    stops: [cdf,nwp,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5492
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
   - code: 5493
     stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
   - code: 5499
@@ -235,20 +333,48 @@ pis:
     stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5504
     stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,dwl,tgm,nta,trr,tqy,pgn]
+  - code: 5505
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5506
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5508
+    stops: [bpw,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,soa,esl,hde,boe,frm,ftn,pms,pmh]
+  - code: 5509
+    stops: [bpw,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
   - code: 5510
     stops: [bpw,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply]
   - code: 5511
     stops: [bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5512
+    stops: [bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 5513
     stops: [cfn,rda,mtp,srd,lwh,bri]
+  - code: 5514
+    stops: [cdf,nwp,stj,bpw,fit,bri]
+  - code: 5515
+    stops: [cdf,nwp,pwy,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5517
+    stops: [cdf,nwp,stj,fit,bri,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5518
+    stops: [cdf,nwp,stj,fit,bri,kwn,olf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5519
+    stops: [cdf,nwp,stj,pwy,fit,bri,bth,ffd,avf,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5521
+    stops: [fit,kyn,olf,bth]
+  - code: 5522
+    stops: [fit,srd,bri]
   - code: 5523
     stops: [fit,srd,lwh,bri] # [reverse,5513]
   - code: 5524
     stops: [fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5525
+    stops: [fit,srd,lwh,bri,kyn,olf,bth,ffd,boa,tro,wsb,dmh,wmn]
   - code: 5526
     stops: [fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5527
     stops: [fit,srd,bri,bmt,psn,nls,yat,wor,wnm,wsm]
+  - code: 5528
+    stops: [fit,srd,lwh,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb]
   - code: 5533
     stops: [pmh,pms,ftn,csa,frm,sou,rom,sal,wmn,wsb,tro,boa,bth,bri]
   - code: 5542
@@ -263,20 +389,38 @@ pis:
     stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,dww,dwl,tgm,nta,tot,ivy,ply,lsk,bod,los,par,lux,bgl,roc,scr,qui,nwq]
   - code: 5570
     stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau]
+  - code: 5571
+    stops: [bpw,fit,srd,lwh,bri,kyn,olf,bth,boa,tro,wsb]
   - code: 5572
     stops: [cdf,nwp,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5573
     stops: [gcr,cdu,yae,bpw,fit,srd,lwh,bri]
+  - code: 5574
+    stops: [gmv,mvl,wof,wos,asc,cnm,gcr,fit,bri]
   - code: 5587
     stops: [bri,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd]
   - code: 5590
     stops: [cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wsm,hig,bwt,tau]
+  - code: 5591
+    stops: [cdf,btn] ### Not in use, intermediate stops omitted
+  - code: 5592
+    stops: [cdf,nwp,stj,fit,bri,bth,boa,tro,wsb,wmn,sal,rom,sou,frm,ftn,pms,pmh]
+  - code: 5593
+    stops: [cdf,nwp,stj,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: 5601
+    stops: [fro,wsb,dmh,wmn,sal,rom,sou]
+  - code: 5602
+    stops: [gcr,cdu,yae,bpw,fit,bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
+  - code: 5603
+    stops: [gmv,btn] ### Not in use, intermediate stops omitted
   - code: 5608
     stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
   - code: 5613
     stops: [wos,asc,cnm,gcr,cdu,yae,bpw,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 5617
     stops: [bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd]
+  - code: 5618
+    stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,fro]
   - code: 5619
     stops: [bri,wsm,hig,bwt,tau,tvp,exd,ext,scs,dww,dwl,tgm,nta,tot,ivy,ply,dvp,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
   - code: 5620
@@ -355,4 +499,36 @@ pis:
     stops: [svb,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
   - code: 6082
     stops: [svb,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm]
-## 6088 is next
+  - code: 6088
+    stops: [bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd,dwl,tgm,nta,tot,ivy,ply,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6093
+    stops: [cdf,nwp,stj,pil,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6095
+    stops: [cdf,nwp,stj,pil,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,dvp,doc,key,sbf,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6097
+    stops: [cdf,nwp,stj,pwy,fit,bri,psn,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dwl,tgm,nta,tot,ivy,ply,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6099
+    stops: [bri,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,dvp,doc,key,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6101
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,exd,dww,tgm,nta,tot,ivy,ply,dvp,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6103
+    stops: [cdf,nwl,stj,pwy,fit,bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6123
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6125
+    stops: [cdf,nwl,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dww,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6134
+    stops: [bri,nls,yat,wor,wsm,hig,bwt,tau,tvp,exd,dww,tgm,nta,tot,ivy,ply,dvp,sbf,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6136
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,men,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6137
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+  - code: 6139
+    stops: [cdf,nwp,stj,pwy,fit,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,tvp,exd,dww,dwl,tgm,nta,tot,ivy,ply,sts,sgm,lsk,bod,los,par,sau,tru,red,cbn,hyl,ser,pnz]
+  - code: 6140
+    stops: [svb,sar,avn,pri,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+  - code: 6141
+    stops: [svb,sar,avn,shh,sml,cfn,rda,mtp,srd,lwh,bri,bmt,psn,nls,yat,wor,wnm,wsm,hig,bwt,tau,exd]
+
+### Still to do: `North PNZ to CDF-WOS`
+### Next Up: 5622