diff --git a/CAM/zoncoffee.GBL b/CAM/zoncoffee.GBL
--- a/CAM/zoncoffee.GBL
+++ b/CAM/zoncoffee.GBL
@@ -1366,105 +1366,344 @@ X013818Y008393D03*
 X012818Y008393D03*
 X011693Y008393D03*
 X010693Y008393D03*
-X009943Y004831D03*
-X008943Y004831D03*
+X010349Y004800D03*
+X011349Y004800D03*
 D12*
-X007724Y004789D03*
-X007724Y005045D03*
-X007724Y005301D03*
-X007724Y005557D03*
-X007724Y005813D03*
-X007724Y006069D03*
-X007724Y006325D03*
-X007724Y006581D03*
-X007724Y006837D03*
-X007724Y007093D03*
-X007724Y007349D03*
-X007724Y007604D03*
-X007724Y007860D03*
-X007724Y008116D03*
-X007724Y008372D03*
+X007724Y004852D03*
+X007724Y005108D03*
+X007724Y005364D03*
+X007724Y005620D03*
+X007724Y005876D03*
+X007724Y006131D03*
+X007724Y006387D03*
+X007724Y006643D03*
+X007724Y006899D03*
+X007724Y007155D03*
+X007724Y007411D03*
+X007724Y007667D03*
+X007724Y007923D03*
+X007724Y008179D03*
+X007724Y008435D03*
 D13*
-X010912Y004737D03*
-X011412Y004737D03*
-X011912Y004737D03*
-X012412Y004737D03*
-X012912Y004737D03*
-X013412Y004737D03*
+X012162Y004737D03*
+X012662Y004737D03*
+X013162Y004737D03*
+X013662Y004737D03*
+X014162Y004737D03*
+X014662Y004737D03*
 D14*
-X013702Y004907D02*
-X013702Y004966D01*
-X013625Y005042D01*
-X013198Y005042D01*
-X013176Y005020D01*
-X013164Y005032D01*
-X013129Y005052D01*
-X013091Y005062D01*
-X012942Y005062D01*
-X012942Y004767D01*
-X012882Y004767D01*
-X012882Y005062D01*
-X012732Y005062D01*
-X012694Y005052D01*
-X012659Y005032D01*
-X012647Y005020D01*
-X012645Y005022D01*
-X012662Y005062D01*
-X012662Y005162D01*
-X012624Y005254D01*
-X012553Y005324D01*
-X012461Y005362D01*
-X012362Y005362D01*
-X012270Y005324D01*
-X012200Y005254D01*
-X012162Y005162D01*
-X012162Y005062D01*
-X012178Y005022D01*
-X012162Y005006D01*
-X012145Y005022D01*
-X012162Y005062D01*
-X012162Y005162D01*
-X012124Y005254D01*
-X012053Y005324D01*
-X011961Y005362D01*
-X011862Y005362D01*
-X011770Y005324D01*
-X011700Y005254D01*
-X011662Y005162D01*
-X011662Y005062D01*
-X011678Y005022D01*
-X011662Y005006D01*
-X011645Y005023D01*
-X011662Y005064D01*
-X011662Y005163D01*
-X011624Y005255D01*
-X011553Y005325D01*
-X011461Y005363D01*
-X011362Y005363D01*
-X011270Y005325D01*
-X011200Y005255D01*
-X011162Y005163D01*
-X011162Y005064D01*
-X011178Y005023D01*
-X011162Y005006D01*
-X011125Y005042D01*
-X010698Y005042D01*
-X010622Y004966D01*
-X010622Y004960D01*
-X010555Y004987D01*
-X010456Y004987D01*
-X010373Y004953D01*
-X010373Y005185D01*
-X010297Y005261D01*
-X009589Y005261D01*
-X009513Y005185D01*
-X009513Y004543D01*
-X009373Y004543D01*
-X009373Y005185D01*
-X009297Y005261D01*
-X008589Y005261D01*
-X008513Y005185D01*
-X008513Y004543D01*
+X014952Y004751D02*
+X014952Y004966D01*
+X014875Y005042D01*
+X014448Y005042D01*
+X014426Y005020D01*
+X014414Y005032D01*
+X014379Y005052D01*
+X014341Y005062D01*
+X014192Y005062D01*
+X014192Y004767D01*
+X014132Y004767D01*
+X014132Y005062D01*
+X013982Y005062D01*
+X013944Y005052D01*
+X013909Y005032D01*
+X013897Y005020D01*
+X013875Y005042D01*
+X013832Y005042D01*
+X013832Y005089D01*
+X013238Y005682D01*
+X013138Y005782D01*
+X012603Y005782D01*
+X012857Y006036D01*
+X014235Y006036D01*
+X014262Y005970D01*
+X014332Y005900D01*
+X014424Y005862D01*
+X014524Y005862D01*
+X014616Y005900D01*
+X014686Y005970D01*
+X014705Y006016D01*
+X014742Y005979D01*
+X014841Y005880D01*
+X015326Y005880D01*
+X015496Y006050D01*
+X015555Y006050D01*
+X015647Y006088D01*
+X015717Y006158D01*
+X015755Y006250D01*
+X015755Y006349D01*
+X015717Y006441D01*
+X015654Y006505D01*
+X016310Y006505D01*
+X017179Y005635D01*
+X017220Y005595D01*
+X014513Y005595D01*
+X014443Y005665D01*
+X014443Y005724D01*
+X014405Y005816D01*
+X014334Y005886D01*
+X014243Y005925D01*
+X014143Y005925D01*
+X014051Y005886D01*
+X013981Y005816D01*
+X013943Y005724D01*
+X013943Y005625D01*
+X013949Y005609D01*
+X013864Y005574D01*
+X013793Y005504D01*
+X013755Y005412D01*
+X013755Y005312D01*
+X013793Y005220D01*
+X013864Y005150D01*
+X013956Y005112D01*
+X014015Y005112D01*
+X014029Y005098D01*
+X019013Y005098D01*
+X019113Y005198D01*
+X019708Y005793D01*
+X019768Y005768D01*
+X019868Y005768D01*
+X019959Y005806D01*
+X020030Y005877D01*
+X020068Y005969D01*
+X020068Y006068D01*
+X020030Y006160D01*
+X019959Y006230D01*
+X019868Y006268D01*
+X019818Y006268D01*
+X019818Y006311D01*
+X019780Y006403D01*
+X019709Y006474D01*
+X019618Y006512D01*
+X019518Y006512D01*
+X019426Y006474D01*
+X019356Y006403D01*
+X019318Y006311D01*
+X019318Y006212D01*
+X019350Y006135D01*
+X018810Y005595D01*
+X018292Y005595D01*
+X018318Y005656D01*
+X018318Y005756D01*
+X018280Y005847D01*
+X018209Y005918D01*
+X018118Y005956D01*
+X018018Y005956D01*
+X017926Y005918D01*
+X017884Y005876D01*
+X017745Y005876D01*
+X017803Y005900D01*
+X017874Y005970D01*
+X017912Y006062D01*
+X017912Y006162D01*
+X017874Y006254D01*
+X017803Y006324D01*
+X017711Y006362D01*
+X017612Y006362D01*
+X017520Y006324D01*
+X017478Y006282D01*
+X017404Y006282D01*
+X017467Y006345D01*
+X017505Y006437D01*
+X017505Y006537D01*
+X017467Y006629D01*
+X017466Y006630D01*
+X018947Y006630D01*
+X018989Y006588D01*
+X019081Y006550D01*
+X019180Y006550D01*
+X019272Y006588D01*
+X019342Y006658D01*
+X019380Y006750D01*
+X019380Y006849D01*
+X019342Y006941D01*
+X019272Y007011D01*
+X019180Y007050D01*
+X019081Y007050D01*
+X018989Y007011D01*
+X018947Y006970D01*
+X017882Y006970D01*
+X017916Y007004D01*
+X017962Y007113D01*
+X017962Y007231D01*
+X017916Y007341D01*
+X017878Y007380D01*
+X018134Y007380D01*
+X018176Y007338D01*
+X018268Y007300D01*
+X018368Y007300D01*
+X018459Y007338D01*
+X018530Y007408D01*
+X018568Y007500D01*
+X018568Y007599D01*
+X018530Y007691D01*
+X018459Y007761D01*
+X018401Y007786D01*
+X020478Y007786D01*
+X020520Y007744D01*
+X020612Y007706D01*
+X020711Y007706D01*
+X020803Y007744D01*
+X020874Y007814D01*
+X020912Y007906D01*
+X020912Y008006D01*
+X020874Y008097D01*
+X020803Y008168D01*
+X020711Y008206D01*
+X020612Y008206D01*
+X020520Y008168D01*
+X020478Y008126D01*
+X017622Y008126D01*
+X017122Y007626D01*
+X012263Y007626D01*
+X012113Y007776D01*
+X012013Y007876D01*
+X010185Y007876D01*
+X009874Y007565D01*
+X009834Y007605D01*
+X009743Y007643D01*
+X009643Y007643D01*
+X009551Y007605D01*
+X009481Y007535D01*
+X009443Y007443D01*
+X009443Y007344D01*
+X009481Y007252D01*
+X009551Y007181D01*
+X009643Y007143D01*
+X009743Y007143D01*
+X009834Y007181D01*
+X009876Y007223D01*
+X010013Y007223D01*
+X010113Y007323D01*
+X010326Y007536D01*
+X010862Y007536D01*
+X010849Y007506D01*
+X010849Y007406D01*
+X010887Y007314D01*
+X010957Y007244D01*
+X011049Y007206D01*
+X011068Y007206D01*
+X011068Y007156D01*
+X011106Y007064D01*
+X011107Y007063D01*
+X009345Y007063D01*
+X009303Y007105D01*
+X009211Y007143D01*
+X009112Y007143D01*
+X009030Y007109D01*
+X009005Y007134D01*
+X009005Y007193D01*
+X008967Y007285D01*
+X008897Y007355D01*
+X008805Y007393D01*
+X008706Y007393D01*
+X008644Y007368D01*
+X008644Y007616D01*
+X008686Y007658D01*
+X008724Y007750D01*
+X008724Y007849D01*
+X008686Y007941D01*
+X008616Y008011D01*
+X008524Y008050D01*
+X008424Y008050D01*
+X008366Y008025D01*
+X008366Y008046D01*
+X008361Y008051D01*
+X008366Y008056D01*
+X008366Y008301D01*
+X008361Y008307D01*
+X008366Y008312D01*
+X008366Y008557D01*
+X008290Y008634D01*
+X007159Y008634D01*
+X007130Y008605D01*
+X006539Y008605D01*
+X006497Y008563D01*
+X006189Y008563D01*
+X006147Y008605D01*
+X006055Y008643D01*
+X005956Y008643D01*
+X005864Y008605D01*
+X005793Y008535D01*
+X005780Y008503D01*
+X005743Y008518D01*
+X005643Y008518D01*
+X005551Y008480D01*
+X005481Y008410D01*
+X005443Y008318D01*
+X005443Y008219D01*
+X005481Y008127D01*
+X005496Y008112D01*
+X005481Y008097D01*
+X005443Y008006D01*
+X005443Y007906D01*
+X005481Y007814D01*
+X005496Y007800D01*
+X005481Y007785D01*
+X005443Y007693D01*
+X005443Y007594D01*
+X005481Y007502D01*
+X005496Y007487D01*
+X005481Y007472D01*
+X005443Y007381D01*
+X005443Y007281D01*
+X005481Y007189D01*
+X005551Y007119D01*
+X005643Y007081D01*
+X005743Y007081D01*
+X005834Y007119D01*
+X005905Y007189D01*
+X005926Y007241D01*
+X007063Y007241D01*
+X007063Y007155D01*
+X007063Y007066D01*
+X007063Y007063D01*
+X005847Y007063D01*
+X005805Y007081D01*
+X005706Y007081D01*
+X005614Y007043D01*
+X005543Y006972D01*
+X005505Y006881D01*
+X005505Y006781D01*
+X005543Y006689D01*
+X005614Y006619D01*
+X005623Y006615D01*
+X005606Y006597D01*
+X005568Y006506D01*
+X005568Y006406D01*
+X005606Y006314D01*
+X005676Y006244D01*
+X005768Y006206D01*
+X005773Y006206D01*
+X005773Y006193D01*
+X005743Y006206D01*
+X005643Y006206D01*
+X005551Y006168D01*
+X005481Y006097D01*
+X005443Y006006D01*
+X005443Y005946D01*
+X005398Y005901D01*
+X005398Y005194D01*
+X005910Y004682D01*
+X007130Y004682D01*
+X007159Y004653D01*
+X008290Y004653D01*
+X008366Y004729D01*
+X008366Y004975D01*
+X008361Y004980D01*
+X008366Y004985D01*
+X008366Y005231D01*
+X008361Y005236D01*
+X008366Y005241D01*
+X008366Y005292D01*
+X008424Y005268D01*
+X008524Y005268D01*
+X008566Y005286D01*
+X010679Y005286D01*
+X010679Y005230D01*
+X009995Y005230D01*
+X009919Y005153D01*
+X009919Y004543D01*
 X006236Y004543D01*
 X006161Y004618D01*
 X005975Y004618D01*
@@ -1509,22 +1748,23 @@ X006161Y008668D01*
 X006236Y008743D01*
 X010263Y008743D01*
 X010263Y008563D01*
-X010060Y008563D01*
-X009702Y008206D01*
-X009643Y008206D01*
-X009551Y008168D01*
-X009481Y008097D01*
-X009443Y008006D01*
-X009443Y007906D01*
-X009481Y007814D01*
-X009551Y007744D01*
-X009643Y007706D01*
-X009743Y007706D01*
-X009834Y007744D01*
-X009905Y007814D01*
-X009943Y007906D01*
-X009943Y007965D01*
-X010201Y008223D01*
+X009810Y008563D01*
+X009710Y008464D01*
+X009171Y007925D01*
+X009112Y007925D01*
+X009020Y007886D01*
+X008950Y007816D01*
+X008912Y007724D01*
+X008912Y007625D01*
+X008950Y007533D01*
+X009020Y007463D01*
+X009112Y007425D01*
+X009211Y007425D01*
+X009303Y007463D01*
+X009374Y007533D01*
+X009412Y007625D01*
+X009412Y007684D01*
+X009951Y008223D01*
 X010263Y008223D01*
 X010263Y008039D01*
 X010339Y007963D01*
@@ -1561,23 +1801,22 @@ X013368Y008713D01*
 X013368Y008443D01*
 X013768Y008443D01*
 X013768Y008343D01*
-X013368Y008343D01*
-X013368Y008074D01*
-X013378Y008035D01*
-X013398Y008001D01*
-X013426Y007973D01*
-X013460Y007954D01*
-X013498Y007943D01*
-X013531Y007943D01*
-X013505Y007881D01*
-X013505Y007781D01*
-X013543Y007689D01*
-X013614Y007619D01*
-X013706Y007581D01*
-X013805Y007581D01*
-X013897Y007619D01*
-X013939Y007661D01*
-X016410Y007661D01*
+X013868Y008343D01*
+X013868Y007943D01*
+X014138Y007943D01*
+X014176Y007954D01*
+X014210Y007973D01*
+X014233Y007997D01*
+X014224Y007974D01*
+X014224Y007875D01*
+X014262Y007783D01*
+X014332Y007713D01*
+X014424Y007675D01*
+X014524Y007675D01*
+X014616Y007713D01*
+X014658Y007755D01*
+X016503Y007755D01*
+X016603Y007854D01*
 X016763Y008014D01*
 X016863Y008114D01*
 X016863Y008460D01*
@@ -1658,677 +1897,59 @@ X020418Y005222D01*
 X020380Y005131D01*
 X020380Y005071D01*
 X020060Y004751D01*
-X013951Y004751D01*
-X013795Y004907D01*
-X013702Y004907D01*
-X013702Y004962D02*
-X014021Y004962D01*
-X014051Y004931D02*
-X014143Y004893D01*
-X014243Y004893D01*
-X014334Y004931D01*
-X014405Y005002D01*
-X014443Y005094D01*
-X014443Y005098D01*
-X019013Y005098D01*
-X020058Y006143D01*
-X020118Y006143D01*
-X020209Y006181D01*
-X020280Y006252D01*
-X020318Y006344D01*
-X020318Y006443D01*
-X020280Y006535D01*
-X020209Y006605D01*
-X020118Y006643D01*
-X020068Y006643D01*
-X020068Y006686D01*
-X020030Y006778D01*
-X019959Y006849D01*
-X019868Y006887D01*
-X019768Y006887D01*
-X019676Y006849D01*
-X019606Y006778D01*
-X019568Y006686D01*
-X019568Y006587D01*
-X019606Y006495D01*
-X019648Y006453D01*
-X019648Y006432D01*
-X018810Y005595D01*
-X018292Y005595D01*
-X018318Y005656D01*
-X018318Y005756D01*
-X018280Y005847D01*
-X018209Y005918D01*
-X018118Y005956D01*
-X018018Y005956D01*
-X017926Y005918D01*
-X017884Y005876D01*
-X017745Y005876D01*
-X017803Y005900D01*
-X017874Y005970D01*
-X017912Y006062D01*
-X017912Y006162D01*
-X017874Y006254D01*
-X017803Y006324D01*
-X017711Y006362D01*
-X017612Y006362D01*
-X017520Y006324D01*
-X017478Y006282D01*
-X017404Y006282D01*
-X017467Y006345D01*
-X017505Y006437D01*
-X017505Y006537D01*
-X017467Y006629D01*
-X017466Y006630D01*
-X018947Y006630D01*
-X018989Y006588D01*
-X019081Y006550D01*
-X019180Y006550D01*
-X019272Y006588D01*
-X019342Y006658D01*
-X019380Y006750D01*
-X019380Y006849D01*
-X019342Y006941D01*
-X019272Y007011D01*
-X019180Y007050D01*
-X019081Y007050D01*
-X018989Y007011D01*
-X018947Y006970D01*
-X017882Y006970D01*
-X017916Y007004D01*
-X017962Y007113D01*
-X017962Y007231D01*
-X017916Y007341D01*
-X017878Y007380D01*
-X018134Y007380D01*
-X018176Y007338D01*
-X018268Y007300D01*
-X018368Y007300D01*
-X018459Y007338D01*
-X018530Y007408D01*
-X018568Y007500D01*
-X018568Y007599D01*
-X018530Y007691D01*
-X018459Y007761D01*
-X018401Y007786D01*
-X020478Y007786D01*
-X020520Y007744D01*
-X020612Y007706D01*
-X020711Y007706D01*
-X020803Y007744D01*
-X020874Y007814D01*
-X020912Y007906D01*
-X020912Y008006D01*
-X020874Y008097D01*
-X020803Y008168D01*
-X020711Y008206D01*
-X020612Y008206D01*
-X020520Y008168D01*
-X020478Y008126D01*
-X017747Y008126D01*
-X017122Y007501D01*
-X012451Y007501D01*
-X012394Y007557D01*
-X012295Y007657D01*
-X011564Y007657D01*
-X011522Y007699D01*
-X011430Y007737D01*
-X011331Y007737D01*
-X011239Y007699D01*
-X011168Y007629D01*
-X011130Y007537D01*
-X011130Y007437D01*
-X011168Y007345D01*
-X011239Y007275D01*
-X011318Y007242D01*
-X011318Y007187D01*
-X011356Y007095D01*
-X011426Y007025D01*
-X011518Y006987D01*
-X011599Y006987D01*
-X011599Y006982D01*
-X011520Y006949D01*
-X011450Y006879D01*
-X011412Y006787D01*
-X011412Y006687D01*
-X011450Y006595D01*
-X011520Y006525D01*
-X011612Y006487D01*
-X011711Y006487D01*
-X011787Y006518D01*
-X011787Y006438D01*
-X011739Y006418D01*
-X011668Y006347D01*
-X011630Y006256D01*
-X011630Y006219D01*
-X011586Y006237D01*
-X011487Y006237D01*
-X011395Y006199D01*
-X011325Y006129D01*
-X011287Y006037D01*
-X011287Y005937D01*
-X011299Y005907D01*
-X009653Y005907D01*
-X009044Y006516D01*
-X009061Y006533D01*
-X009099Y006625D01*
-X009099Y006724D01*
-X009061Y006816D01*
-X008991Y006886D01*
-X008943Y006906D01*
-X008943Y007006D01*
-X008905Y007097D01*
-X008834Y007168D01*
-X008743Y007206D01*
-X008643Y007206D01*
-X008613Y007193D01*
-X008613Y007479D01*
-X008902Y007768D01*
-X008961Y007768D01*
-X009053Y007806D01*
-X009124Y007877D01*
-X009162Y007969D01*
-X009162Y008068D01*
-X009124Y008160D01*
-X009053Y008230D01*
-X008961Y008268D01*
-X008862Y008268D01*
-X008770Y008230D01*
-X008700Y008160D01*
-X008662Y008068D01*
-X008662Y008009D01*
-X008366Y007713D01*
-X008366Y007727D01*
-X008361Y007732D01*
-X008366Y007738D01*
-X008366Y007983D01*
-X008361Y007988D01*
-X008366Y007993D01*
-X008366Y008239D01*
-X008361Y008244D01*
-X008366Y008249D01*
-X008366Y008495D01*
-X008290Y008571D01*
-X007159Y008571D01*
-X007130Y008542D01*
-X006741Y008542D01*
-X006709Y008574D01*
-X006618Y008612D01*
-X006518Y008612D01*
-X006426Y008574D01*
-X006356Y008504D01*
-X006343Y008472D01*
-X006334Y008480D01*
-X006243Y008518D01*
-X006143Y008518D01*
-X006051Y008480D01*
-X005981Y008410D01*
-X005943Y008318D01*
-X005943Y008219D01*
-X005981Y008127D01*
-X005996Y008112D01*
-X005981Y008097D01*
-X005943Y008006D01*
-X005943Y007906D01*
-X005981Y007814D01*
-X005996Y007800D01*
-X005981Y007785D01*
-X005943Y007693D01*
-X005943Y007594D01*
-X005948Y007581D01*
-X005893Y007581D01*
-X005801Y007543D01*
-X005731Y007472D01*
-X005693Y007381D01*
-X005693Y007281D01*
-X005731Y007189D01*
-X005801Y007119D01*
-X005893Y007081D01*
-X005993Y007081D01*
-X006084Y007119D01*
-X006144Y007179D01*
-X007063Y007179D01*
-X007063Y007093D01*
-X007724Y007093D01*
-X007724Y007093D01*
-X007063Y007093D01*
-X007063Y007007D01*
-X006433Y007007D01*
-X006397Y007043D01*
-X006305Y007081D01*
-X006206Y007081D01*
-X006114Y007043D01*
-X006043Y006972D01*
-X006005Y006881D01*
-X006005Y006781D01*
-X006043Y006689D01*
-X006114Y006619D01*
-X006206Y006581D01*
-X006224Y006581D01*
-X006224Y006531D01*
-X006262Y006439D01*
-X006332Y006369D01*
-X006424Y006331D01*
-X006474Y006331D01*
-X006443Y006256D01*
-X006443Y006156D01*
-X006481Y006064D01*
-X006551Y005994D01*
-X006605Y005971D01*
-X006568Y005881D01*
-X006568Y005781D01*
-X006606Y005689D01*
-X006676Y005619D01*
-X006755Y005586D01*
-X006755Y005500D01*
-X006767Y005471D01*
-X006255Y005471D01*
-X006255Y005506D01*
-X006217Y005597D01*
-X006147Y005668D01*
-X006057Y005705D01*
-X006113Y005760D01*
-X006113Y006401D01*
-X006068Y006446D01*
-X006068Y006506D01*
-X006030Y006597D01*
-X005959Y006668D01*
-X005868Y006706D01*
-X005768Y006706D01*
-X005676Y006668D01*
-X005606Y006597D01*
-X005568Y006506D01*
-X005568Y006406D01*
-X005606Y006314D01*
-X005676Y006244D01*
-X005768Y006206D01*
-X005773Y006206D01*
-X005773Y006193D01*
-X005743Y006206D01*
-X005643Y006206D01*
-X005551Y006168D01*
-X005481Y006097D01*
-X005443Y006006D01*
-X005443Y005946D01*
-X005398Y005901D01*
-X005398Y005194D01*
-X005873Y004719D01*
-X005972Y004619D01*
-X007130Y004619D01*
-X007159Y004591D01*
-X008290Y004591D01*
-X008366Y004667D01*
-X008366Y004912D01*
-X008361Y004917D01*
-X008366Y004923D01*
-X008366Y005168D01*
-X008361Y005173D01*
-X008366Y005179D01*
-X008366Y005424D01*
-X008361Y005429D01*
-X008366Y005434D01*
-X008366Y005680D01*
-X008361Y005685D01*
-X008366Y005690D01*
-X008366Y005842D01*
-X008393Y005831D01*
-X008493Y005831D01*
-X008584Y005869D01*
-X008655Y005939D01*
-X008693Y006031D01*
-X008693Y006131D01*
-X008679Y006165D01*
-X009333Y005510D01*
-X009433Y005411D01*
-X012263Y005411D01*
-X012363Y005510D01*
-X012363Y005510D01*
-X012763Y005911D01*
-X014255Y005911D01*
-X014255Y005906D01*
-X014293Y005814D01*
-X014364Y005744D01*
-X014456Y005706D01*
-X014555Y005706D01*
-X014647Y005744D01*
-X014717Y005814D01*
-X014755Y005906D01*
-X014755Y005965D01*
-X014841Y005880D01*
-X015326Y005880D01*
-X015496Y006050D01*
-X015555Y006050D01*
-X015647Y006088D01*
-X015717Y006158D01*
-X015755Y006250D01*
-X015755Y006349D01*
-X015743Y006380D01*
-X016435Y006380D01*
-X017179Y005635D01*
-X017220Y005595D01*
-X014126Y005595D01*
-X014084Y005636D01*
-X013993Y005675D01*
-X013893Y005675D01*
-X013801Y005636D01*
-X013731Y005566D01*
-X013693Y005474D01*
-X013693Y005375D01*
-X013731Y005283D01*
-X013801Y005213D01*
-X013893Y005175D01*
-X013943Y005175D01*
-X013943Y005094D01*
-X013981Y005002D01*
-X014051Y004931D01*
-X013957Y005060D02*
-X013098Y005060D01*
-X012942Y005060D02*
-X012882Y005060D01*
-X012882Y004962D02*
-X012942Y004962D01*
-X012942Y004863D02*
-X012882Y004863D01*
-X012725Y005060D02*
-X012661Y005060D01*
-X012662Y005159D02*
-X013943Y005159D01*
-X013757Y005257D02*
-X012620Y005257D01*
-X012476Y005356D02*
-X013701Y005356D01*
-X013693Y005454D02*
-X012307Y005454D01*
-X012347Y005356D02*
-X011976Y005356D01*
-X011847Y005356D02*
-X011479Y005356D01*
-X011344Y005356D02*
-X008366Y005356D01*
-X008366Y005454D02*
-X009389Y005454D01*
-X009333Y005510D02*
-X009333Y005510D01*
-X009291Y005553D02*
-X008366Y005553D01*
-X008366Y005651D02*
-X009192Y005651D01*
-X009094Y005750D02*
-X008366Y005750D01*
-X008535Y005848D02*
-X008995Y005848D01*
-X008897Y005947D02*
-X008658Y005947D01*
-X008693Y006045D02*
-X008798Y006045D01*
-X008700Y006144D02*
-X008687Y006144D01*
-X009121Y006439D02*
-X011787Y006439D01*
-X011666Y006341D02*
-X009219Y006341D01*
-X009318Y006242D02*
-X011630Y006242D01*
-X011340Y006144D02*
-X009416Y006144D01*
-X009515Y006045D02*
-X011290Y006045D01*
-X011287Y005947D02*
-X009613Y005947D01*
-X009063Y006538D02*
-X011507Y006538D01*
-X011433Y006636D02*
-X009099Y006636D01*
-X009095Y006735D02*
-X011412Y006735D01*
-X011431Y006833D02*
-X009044Y006833D01*
-X008943Y006932D02*
-X011503Y006932D01*
-X011421Y007030D02*
-X008933Y007030D01*
-X008873Y007129D02*
-X011342Y007129D01*
-X011318Y007227D02*
-X008613Y007227D01*
-X008613Y007326D02*
-X011188Y007326D01*
-X011136Y007424D02*
-X008613Y007424D01*
-X008657Y007523D02*
-X011130Y007523D01*
-X011165Y007621D02*
-X008755Y007621D01*
-X008854Y007720D02*
-X009609Y007720D01*
-X009479Y007818D02*
-X009065Y007818D01*
-X009140Y007917D02*
-X009443Y007917D01*
-X009447Y008015D02*
-X009162Y008015D01*
-X009143Y008114D02*
-X009497Y008114D01*
-X009709Y008212D02*
-X009071Y008212D01*
-X008752Y008212D02*
-X008366Y008212D01*
-X008366Y008114D02*
-X008681Y008114D01*
-X008662Y008015D02*
-X008366Y008015D01*
-X008366Y007917D02*
-X008570Y007917D01*
-X008471Y007818D02*
-X008366Y007818D01*
-X008366Y007720D02*
-X008373Y007720D01*
-X008366Y008311D02*
-X009807Y008311D01*
-X009906Y008409D02*
-X008366Y008409D01*
-X008353Y008508D02*
-X010004Y008508D01*
-X010263Y008606D02*
-X006631Y008606D01*
-X006504Y008606D02*
-X004593Y008606D01*
-X004593Y008508D02*
-X006118Y008508D01*
-X006268Y008508D02*
-X006360Y008508D01*
-X006198Y008705D02*
-X010263Y008705D01*
-X011123Y008705D02*
-X011243Y008705D01*
-X011243Y008606D02*
-X011123Y008606D01*
-X011123Y008508D02*
-X011243Y008508D01*
-X011123Y008409D02*
-X011643Y008409D01*
-X011643Y008343D02*
-X011243Y008343D01*
-X011243Y008074D01*
-X011253Y008035D01*
-X011273Y008001D01*
-X011301Y007973D01*
-X011335Y007954D01*
-X011373Y007943D01*
-X011643Y007943D01*
-X011643Y008343D01*
-X011643Y008311D02*
-X011743Y008311D01*
-X011743Y008409D02*
-X012388Y008409D01*
-X012388Y008311D02*
-X012143Y008311D01*
-X012143Y008212D02*
-X012388Y008212D01*
-X012388Y008114D02*
-X012143Y008114D01*
-X012121Y008015D02*
-X012412Y008015D01*
-X012330Y007621D02*
-X013611Y007621D01*
-X013531Y007720D02*
-X011472Y007720D01*
-X011289Y007720D02*
-X009776Y007720D01*
-X009906Y007818D02*
-X013505Y007818D01*
-X013520Y007917D02*
-X009943Y007917D01*
-X009993Y008015D02*
-X010287Y008015D01*
-X010263Y008114D02*
-X010091Y008114D01*
-X010190Y008212D02*
-X010263Y008212D01*
-X011099Y008015D02*
-X011265Y008015D01*
-X011243Y008114D02*
-X011123Y008114D01*
-X011123Y008212D02*
-X011243Y008212D01*
-X011243Y008311D02*
-X011123Y008311D01*
-X011643Y008212D02*
-X011743Y008212D01*
-X011743Y008114D02*
-X011643Y008114D01*
-X011643Y008015D02*
-X011743Y008015D01*
-X012143Y008508D02*
-X012388Y008508D01*
-X012388Y008606D02*
-X012143Y008606D01*
-X012143Y008705D02*
-X012388Y008705D01*
-X013248Y008705D02*
-X013368Y008705D01*
-X013368Y008606D02*
-X013248Y008606D01*
-X013248Y008508D02*
-X013368Y008508D01*
-X013248Y008409D02*
-X013768Y008409D01*
-X013868Y008409D02*
-X014513Y008409D01*
-X014513Y008311D02*
-X014268Y008311D01*
-X014268Y008343D02*
-X013868Y008343D01*
-X013868Y008443D01*
-X014268Y008443D01*
-X014268Y008713D01*
-X014260Y008743D01*
-X014513Y008743D01*
-X014513Y008039D01*
-X014552Y008001D01*
-X014237Y008001D01*
-X014238Y008001D01*
-X014258Y008035D01*
-X014268Y008074D01*
-X014268Y008343D01*
-X014268Y008508D02*
-X014513Y008508D01*
-X014513Y008606D02*
-X014268Y008606D01*
-X014268Y008705D02*
-X014513Y008705D01*
-X014513Y008212D02*
-X014268Y008212D01*
-X014268Y008114D02*
-X014513Y008114D01*
-X014537Y008015D02*
-X014246Y008015D01*
-X013899Y007621D02*
-X017243Y007621D01*
-X017144Y007523D02*
-X012429Y007523D01*
-X013224Y008015D02*
-X013390Y008015D01*
-X013368Y008114D02*
-X013248Y008114D01*
-X013248Y008212D02*
-X013368Y008212D01*
-X013368Y008311D02*
-X013248Y008311D01*
-X016469Y007720D02*
-X017341Y007720D01*
-X017440Y007818D02*
-X016567Y007818D01*
-X016666Y007917D02*
-X017538Y007917D01*
-X017637Y008015D02*
-X016764Y008015D01*
-X016863Y008114D02*
-X017735Y008114D01*
-X018104Y008409D02*
-X016863Y008409D01*
-X016863Y008311D02*
-X020905Y008311D01*
-X020880Y008409D02*
-X018281Y008409D01*
-X017978Y008508D02*
-X016907Y008508D01*
-X016943Y008606D02*
-X017943Y008606D01*
-X017948Y008705D02*
-X016938Y008705D01*
-X016863Y008212D02*
-X020983Y008212D01*
-X020857Y008114D02*
-X022043Y008114D01*
-X022043Y008212D02*
-X021277Y008212D01*
-X021356Y008311D02*
-X022043Y008311D01*
-X022043Y008409D02*
-X021380Y008409D01*
-X021364Y008508D02*
-X022043Y008508D01*
-X022043Y008606D02*
-X021296Y008606D01*
-X020908Y008015D02*
-X022043Y008015D01*
-X022043Y007917D02*
-X020912Y007917D01*
-X020875Y007818D02*
-X022043Y007818D01*
-X022043Y007720D02*
-X020745Y007720D01*
-X020578Y007720D02*
-X018501Y007720D01*
-X018559Y007621D02*
-X022043Y007621D01*
-X022043Y007523D02*
-X018568Y007523D01*
-X018537Y007424D02*
-X022043Y007424D01*
-X022043Y007326D02*
-X018431Y007326D01*
-X018205Y007326D02*
-X017922Y007326D01*
-X017962Y007227D02*
-X022043Y007227D01*
-X022043Y007129D02*
-X017962Y007129D01*
-X017927Y007030D02*
-X019034Y007030D01*
-X019227Y007030D02*
-X022043Y007030D01*
-X022043Y006932D02*
-X019346Y006932D01*
-X019380Y006833D02*
-X019661Y006833D01*
-X019588Y006735D02*
-X019374Y006735D01*
-X019321Y006636D02*
-X019568Y006636D01*
-X019588Y006538D02*
-X017505Y006538D01*
+X014952Y004751D01*
+X014952Y004765D02*
+X020074Y004765D01*
+X020172Y004863D02*
+X014952Y004863D01*
+X014952Y004962D02*
+X020271Y004962D01*
+X020369Y005060D02*
+X014348Y005060D01*
+X014192Y005060D02*
+X014132Y005060D01*
+X014132Y004962D02*
+X014192Y004962D01*
+X014192Y004863D02*
+X014132Y004863D01*
+X013975Y005060D02*
+X013832Y005060D01*
+X013855Y005159D02*
+X013762Y005159D01*
+X013778Y005257D02*
+X013663Y005257D01*
+X013755Y005356D02*
+X013565Y005356D01*
+X013466Y005454D02*
+X013773Y005454D01*
+X013843Y005553D02*
+X013368Y005553D01*
+X013269Y005651D02*
+X013943Y005651D01*
+X013953Y005750D02*
+X013171Y005750D01*
+X012768Y005947D02*
+X014286Y005947D01*
+X014373Y005848D02*
+X016966Y005848D01*
+X017065Y005750D02*
+X014432Y005750D01*
+X014457Y005651D02*
+X017163Y005651D01*
+X016868Y005947D02*
+X015393Y005947D01*
+X015492Y006045D02*
+X016769Y006045D01*
+X016671Y006144D02*
+X015703Y006144D01*
+X015752Y006242D02*
+X016572Y006242D01*
+X016474Y006341D02*
+X015755Y006341D01*
+X015718Y006439D02*
+X016375Y006439D01*
+X017463Y006341D02*
+X017561Y006341D01*
 X017505Y006439D02*
 X018574Y006439D01*
 X018520Y006417D02*
@@ -2370,31 +1991,27 @@ X019038Y005947D02*
 X019162Y005947D01*
 X019078Y006045D02*
 X019261Y006045D01*
-X019359Y006144D02*
+X019346Y006144D02*
 X019078Y006144D01*
 X019055Y006242D02*
-X019458Y006242D01*
-X019556Y006341D02*
+X019318Y006242D01*
+X019330Y006341D02*
 X019000Y006341D01*
 X018869Y006439D02*
-X019648Y006439D01*
-X020134Y006636D02*
-X022043Y006636D01*
-X022043Y006538D02*
-X020277Y006538D01*
-X020318Y006439D02*
+X019392Y006439D01*
+X019744Y006439D02*
 X022043Y006439D01*
 X022043Y006341D02*
-X020317Y006341D01*
-X020270Y006242D02*
+X019806Y006341D01*
+X019930Y006242D02*
 X022043Y006242D01*
 X022043Y006144D02*
-X020119Y006144D01*
-X019960Y006045D02*
+X020036Y006144D01*
+X020068Y006045D02*
 X022043Y006045D01*
 X022043Y005947D02*
-X019862Y005947D01*
-X019763Y005848D02*
+X020059Y005947D01*
+X020001Y005848D02*
 X022043Y005848D01*
 X022043Y005750D02*
 X019665Y005750D01*
@@ -2412,103 +2029,276 @@ X020392Y005159D02*
 X019074Y005159D01*
 X018867Y005651D02*
 X018316Y005651D01*
-X017163Y005651D02*
-X014049Y005651D01*
-X013837Y005651D02*
-X012504Y005651D01*
-X012405Y005553D02*
-X013725Y005553D01*
-X014358Y005750D02*
-X012602Y005750D01*
-X012701Y005848D02*
-X014279Y005848D01*
-X014653Y005750D02*
-X017065Y005750D01*
-X016966Y005848D02*
-X014731Y005848D01*
-X014755Y005947D02*
-X014774Y005947D01*
-X015393Y005947D02*
-X016868Y005947D01*
-X016769Y006045D02*
-X015492Y006045D01*
-X015703Y006144D02*
-X016671Y006144D01*
-X016572Y006242D02*
-X015752Y006242D01*
-X015755Y006341D02*
-X016474Y006341D01*
-X017463Y006341D02*
-X017561Y006341D01*
-X019975Y006833D02*
-X022043Y006833D01*
-X022043Y006735D02*
-X020048Y006735D01*
-X020807Y005257D02*
-X022043Y005257D01*
-X022043Y005159D02*
-X020869Y005159D01*
-X020880Y005060D02*
-X022043Y005060D01*
-X022043Y004962D02*
-X020852Y004962D01*
-X020759Y004863D02*
-X022043Y004863D01*
-X022043Y004765D02*
-X020555Y004765D01*
-X020456Y004666D02*
-X022043Y004666D01*
-X020424Y004568D02*
-X020358Y004568D01*
-X020074Y004765D02*
-X013937Y004765D01*
-X013838Y004863D02*
-X020172Y004863D01*
-X020271Y004962D02*
-X014365Y004962D01*
-X014429Y005060D02*
-X020369Y005060D01*
-X012203Y005257D02*
-X012120Y005257D01*
-X012162Y005159D02*
-X012162Y005159D01*
-X012161Y005060D02*
-X012162Y005060D01*
-X011703Y005257D02*
-X011621Y005257D01*
-X011662Y005159D02*
-X011662Y005159D01*
-X011660Y005060D02*
-X011662Y005060D01*
-X011163Y005060D02*
-X010373Y005060D01*
-X010373Y004962D02*
-X010395Y004962D01*
-X010373Y005159D02*
-X011162Y005159D01*
-X011202Y005257D02*
-X010300Y005257D01*
-X010616Y004962D02*
-X010622Y004962D01*
-X009586Y005257D02*
-X009300Y005257D01*
-X009373Y005159D02*
-X009513Y005159D01*
-X009513Y005060D02*
-X009373Y005060D01*
-X009373Y004962D02*
-X009513Y004962D01*
-X009513Y004863D02*
-X009373Y004863D01*
-X009373Y004765D02*
-X009513Y004765D01*
-X009513Y004666D02*
-X009373Y004666D01*
-X009373Y004568D02*
-X009513Y004568D01*
-X008513Y004568D02*
-X006212Y004568D01*
-X005925Y004666D02*
+X017505Y006538D02*
+X022043Y006538D01*
+X022043Y006636D02*
+X019321Y006636D01*
+X019374Y006735D02*
+X022043Y006735D01*
+X022043Y006833D02*
+X019380Y006833D01*
+X019346Y006932D02*
+X022043Y006932D01*
+X022043Y007030D02*
+X019227Y007030D01*
+X019034Y007030D02*
+X017927Y007030D01*
+X017962Y007129D02*
+X022043Y007129D01*
+X022043Y007227D02*
+X017962Y007227D01*
+X017922Y007326D02*
+X018205Y007326D01*
+X018431Y007326D02*
+X022043Y007326D01*
+X022043Y007424D02*
+X018537Y007424D01*
+X018568Y007523D02*
+X022043Y007523D01*
+X022043Y007621D02*
+X018559Y007621D01*
+X018501Y007720D02*
+X020578Y007720D01*
+X020745Y007720D02*
+X022043Y007720D01*
+X022043Y007818D02*
+X020875Y007818D01*
+X020912Y007917D02*
+X022043Y007917D01*
+X022043Y008015D02*
+X020908Y008015D01*
+X020857Y008114D02*
+X022043Y008114D01*
+X022043Y008212D02*
+X021277Y008212D01*
+X021356Y008311D02*
+X022043Y008311D01*
+X022043Y008409D02*
+X021380Y008409D01*
+X021364Y008508D02*
+X022043Y008508D01*
+X022043Y008606D02*
+X021296Y008606D01*
+X020880Y008409D02*
+X018281Y008409D01*
+X018104Y008409D02*
+X016863Y008409D01*
+X016863Y008311D02*
+X020905Y008311D01*
+X020983Y008212D02*
+X016863Y008212D01*
+X016863Y008114D02*
+X017610Y008114D01*
+X017512Y008015D02*
+X016764Y008015D01*
+X016666Y007917D02*
+X017413Y007917D01*
+X017315Y007818D02*
+X016567Y007818D01*
+X017216Y007720D02*
+X014623Y007720D01*
+X014325Y007720D02*
+X012169Y007720D01*
+X012071Y007818D02*
+X014248Y007818D01*
+X014224Y007917D02*
+X009644Y007917D01*
+X009546Y007818D02*
+X010127Y007818D01*
+X010029Y007720D02*
+X009447Y007720D01*
+X009410Y007621D02*
+X009590Y007621D01*
+X009476Y007523D02*
+X009363Y007523D01*
+X009443Y007424D02*
+X008644Y007424D01*
+X008644Y007523D02*
+X008960Y007523D01*
+X008913Y007621D02*
+X008649Y007621D01*
+X008712Y007720D02*
+X008912Y007720D01*
+X008952Y007818D02*
+X008724Y007818D01*
+X008696Y007917D02*
+X009093Y007917D01*
+X009262Y008015D02*
+X008606Y008015D01*
+X008366Y008114D02*
+X009360Y008114D01*
+X009459Y008212D02*
+X008366Y008212D01*
+X008365Y008311D02*
+X009557Y008311D01*
+X009656Y008409D02*
+X008366Y008409D01*
+X008366Y008508D02*
+X009754Y008508D01*
+X009940Y008212D02*
+X010263Y008212D01*
+X010263Y008114D02*
+X009841Y008114D01*
+X009743Y008015D02*
+X010287Y008015D01*
+X009930Y007621D02*
+X009796Y007621D01*
+X010214Y007424D02*
+X010849Y007424D01*
+X010856Y007523D02*
+X010313Y007523D01*
+X010116Y007326D02*
+X010882Y007326D01*
+X010997Y007227D02*
+X010017Y007227D01*
+X009505Y007227D02*
+X008991Y007227D01*
+X009010Y007129D02*
+X009077Y007129D01*
+X009246Y007129D02*
+X011079Y007129D01*
+X011335Y007954D02*
+X011373Y007943D01*
+X011643Y007943D01*
+X011643Y008343D01*
+X011243Y008343D01*
+X011243Y008074D01*
+X011253Y008035D01*
+X011273Y008001D01*
+X011301Y007973D01*
+X011335Y007954D01*
+X011265Y008015D02*
+X011099Y008015D01*
+X011123Y008114D02*
+X011243Y008114D01*
+X011243Y008212D02*
+X011123Y008212D01*
+X011123Y008311D02*
+X011243Y008311D01*
+X011123Y008409D02*
+X011643Y008409D01*
+X011643Y008311D02*
+X011743Y008311D01*
+X011743Y008409D02*
+X012388Y008409D01*
+X012388Y008311D02*
+X012143Y008311D01*
+X012143Y008212D02*
+X012388Y008212D01*
+X012388Y008114D02*
+X012143Y008114D01*
+X012121Y008015D02*
+X012412Y008015D01*
+X011743Y008015D02*
+X011643Y008015D01*
+X011643Y008114D02*
+X011743Y008114D01*
+X011743Y008212D02*
+X011643Y008212D01*
+X011243Y008508D02*
+X011123Y008508D01*
+X011123Y008606D02*
+X011243Y008606D01*
+X011243Y008705D02*
+X011123Y008705D01*
+X010263Y008705D02*
+X006198Y008705D01*
+X006144Y008606D02*
+X007131Y008606D01*
+X008317Y008606D02*
+X010263Y008606D01*
+X012143Y008606D02*
+X012388Y008606D01*
+X012388Y008508D02*
+X012143Y008508D01*
+X012143Y008705D02*
+X012388Y008705D01*
+X013248Y008705D02*
+X013368Y008705D01*
+X013368Y008606D02*
+X013248Y008606D01*
+X013248Y008508D02*
+X013368Y008508D01*
+X013248Y008409D02*
+X013768Y008409D01*
+X013768Y008343D02*
+X013368Y008343D01*
+X013368Y008074D01*
+X013378Y008035D01*
+X013398Y008001D01*
+X013426Y007973D01*
+X013460Y007954D01*
+X013498Y007943D01*
+X013768Y007943D01*
+X013768Y008343D01*
+X013768Y008311D02*
+X013868Y008311D01*
+X013868Y008343D02*
+X013868Y008443D01*
+X014268Y008443D01*
+X014268Y008713D01*
+X014260Y008743D01*
+X014513Y008743D01*
+X014513Y008175D01*
+X014424Y008175D01*
+X014332Y008136D01*
+X014267Y008071D01*
+X014268Y008074D01*
+X014268Y008343D01*
+X013868Y008343D01*
+X013868Y008409D02*
+X014513Y008409D01*
+X014513Y008311D02*
+X014268Y008311D01*
+X014268Y008212D02*
+X014513Y008212D01*
+X014310Y008114D02*
+X014268Y008114D01*
+X013868Y008114D02*
+X013768Y008114D01*
+X013768Y008212D02*
+X013868Y008212D01*
+X013868Y008015D02*
+X013768Y008015D01*
+X013390Y008015D02*
+X013224Y008015D01*
+X013248Y008114D02*
+X013368Y008114D01*
+X013368Y008212D02*
+X013248Y008212D01*
+X013248Y008311D02*
+X013368Y008311D01*
+X014268Y008508D02*
+X014513Y008508D01*
+X014513Y008606D02*
+X014268Y008606D01*
+X014268Y008705D02*
+X014513Y008705D01*
+X016907Y008508D02*
+X017978Y008508D01*
+X017943Y008606D02*
+X016943Y008606D01*
+X016938Y008705D02*
+X017948Y008705D01*
+X014774Y005947D02*
+X014662Y005947D01*
+X014013Y005848D02*
+X012670Y005848D01*
+X010679Y005257D02*
+X008366Y005257D01*
+X008366Y005159D02*
+X009925Y005159D01*
+X009919Y005060D02*
+X008366Y005060D01*
+X008366Y004962D02*
+X009919Y004962D01*
+X009919Y004863D02*
+X008366Y004863D01*
+X008366Y004765D02*
+X009919Y004765D01*
+X009919Y004666D02*
+X008303Y004666D01*
+X007145Y004666D02*
 X004593Y004666D01*
 X004593Y004765D02*
 X005827Y004765D01*
@@ -2548,314 +2338,345 @@ X005568Y006439D02*
 X004593Y006439D01*
 X004593Y006538D02*
 X005581Y006538D01*
-X005645Y006636D02*
+X005596Y006636D02*
 X004593Y006636D01*
 X004593Y006735D02*
-X006025Y006735D01*
-X006005Y006833D02*
+X005525Y006735D01*
+X005505Y006833D02*
 X004593Y006833D01*
 X004593Y006932D02*
-X006027Y006932D01*
-X006101Y007030D02*
+X005527Y006932D01*
+X005601Y007030D02*
 X004593Y007030D01*
 X004593Y007129D02*
-X005791Y007129D01*
-X005715Y007227D02*
+X005541Y007129D01*
+X005465Y007227D02*
 X004593Y007227D01*
 X004593Y007326D02*
-X005693Y007326D01*
-X005711Y007424D02*
+X005443Y007326D01*
+X005461Y007424D02*
 X004593Y007424D01*
 X004593Y007523D02*
-X005781Y007523D01*
-X005943Y007621D02*
+X005472Y007523D01*
+X005443Y007621D02*
 X004593Y007621D01*
 X004593Y007720D02*
-X005954Y007720D01*
-X005979Y007818D02*
+X005454Y007720D01*
+X005479Y007818D02*
 X004593Y007818D01*
 X004593Y007917D02*
-X005943Y007917D01*
-X005947Y008015D02*
+X005443Y007917D01*
+X005447Y008015D02*
 X004593Y008015D01*
 X004593Y008114D02*
-X005994Y008114D01*
-X005945Y008212D02*
+X005494Y008114D01*
+X005445Y008212D02*
 X004593Y008212D01*
 X004593Y008311D02*
-X005943Y008311D01*
-X005981Y008409D02*
+X005443Y008311D01*
+X005481Y008409D02*
 X004593Y008409D01*
-X006094Y007129D02*
-X007063Y007129D01*
-X007063Y007030D02*
-X006409Y007030D01*
-X006096Y006636D02*
-X005991Y006636D01*
-X006054Y006538D02*
-X006224Y006538D01*
-X006262Y006439D02*
-X006075Y006439D01*
-X006113Y006341D02*
-X006400Y006341D01*
-X006443Y006242D02*
-X006113Y006242D01*
-X006113Y006144D02*
-X006448Y006144D01*
-X006500Y006045D02*
-X006113Y006045D01*
-X006113Y005947D02*
-X006595Y005947D01*
-X006568Y005848D02*
-X006113Y005848D01*
-X006102Y005750D02*
-X006581Y005750D01*
-X006644Y005651D02*
-X006163Y005651D01*
-X006236Y005553D02*
-X006755Y005553D01*
-X008366Y005257D02*
-X008586Y005257D01*
-X008513Y005159D02*
-X008366Y005159D01*
-X008366Y005060D02*
-X008513Y005060D01*
-X008513Y004962D02*
-X008366Y004962D01*
-X008366Y004863D02*
-X008513Y004863D01*
-X008513Y004765D02*
-X008366Y004765D01*
-X008366Y004666D02*
-X008513Y004666D01*
+X004593Y008508D02*
+X005618Y008508D01*
+X005768Y008508D02*
+X005782Y008508D01*
+X005866Y008606D02*
+X004593Y008606D01*
+X005921Y007227D02*
+X007063Y007227D01*
+X007063Y007155D02*
+X007724Y007155D01*
+X007063Y007155D01*
+X007063Y007129D02*
+X005844Y007129D01*
+X007724Y007155D02*
+X007724Y007155D01*
+X008926Y007326D02*
+X009450Y007326D01*
+X009919Y004568D02*
+X006212Y004568D01*
+X020358Y004568D02*
+X020424Y004568D01*
+X020456Y004666D02*
+X022043Y004666D01*
+X022043Y004765D02*
+X020555Y004765D01*
+X020759Y004863D02*
+X022043Y004863D01*
+X022043Y004962D02*
+X020852Y004962D01*
+X020880Y005060D02*
+X022043Y005060D01*
+X022043Y005159D02*
+X020869Y005159D01*
+X020807Y005257D02*
+X022043Y005257D01*
 D15*
-X008443Y005237D03*
-X007005Y005550D03*
-X006818Y005831D03*
-X007005Y006081D03*
-X006693Y006206D03*
-X006474Y006581D03*
-X006255Y006831D03*
-X005818Y006456D03*
-X005693Y005956D03*
-X006005Y005456D03*
-X004787Y005268D03*
-X008443Y006081D03*
-X008849Y006675D03*
-X008693Y006956D03*
-X010162Y006706D03*
-X011380Y007487D03*
-X011568Y007237D03*
-X011849Y006987D03*
-X011662Y006737D03*
-X012037Y006487D03*
-X011880Y006206D03*
-X011537Y005987D03*
-X011412Y005113D03*
-X011912Y005112D03*
-X012412Y005112D03*
-X012912Y005112D03*
-X013943Y005425D03*
-X014193Y005143D03*
-X014505Y005956D03*
-X015005Y006300D03*
-X015505Y006300D03*
-X016005Y006300D03*
+X021130Y005112D03*
+X020630Y005081D03*
+X019818Y006018D03*
+X019568Y006262D03*
+X019130Y006800D03*
+X018693Y007081D03*
+X018318Y007550D03*
 X017255Y006487D03*
 X017662Y006112D03*
 X018068Y005706D03*
-X019130Y006800D03*
-X018755Y007143D03*
-X018318Y007550D03*
-X019818Y006637D03*
-X020068Y006393D03*
-X020130Y007143D03*
+X016005Y006300D03*
+X015505Y006300D03*
+X015005Y006300D03*
+X014474Y006112D03*
+X013724Y005768D03*
+X014193Y005675D03*
+X014005Y005362D03*
+X012662Y005020D03*
+X011130Y005393D03*
+X012224Y006175D03*
+X011974Y006425D03*
+X011755Y006675D03*
+X011505Y006925D03*
+X011318Y007206D03*
+X011099Y007456D03*
+X009724Y007737D03*
+X009162Y007675D03*
+X009693Y007393D03*
+X009162Y006893D03*
+X008755Y007143D03*
+X008380Y006643D03*
+X008630Y006300D03*
+X009099Y006018D03*
+X009412Y006143D03*
+X009724Y006268D03*
+X008787Y005737D03*
+X008474Y005518D03*
+X006162Y005737D03*
+X006005Y005456D03*
+X005693Y005956D03*
+X006193Y006143D03*
+X005818Y006456D03*
+X006099Y006612D03*
+X005755Y006831D03*
+X005693Y007331D03*
+X005693Y007643D03*
+X005693Y007956D03*
+X005693Y008268D03*
+X006005Y008393D03*
+X006443Y008643D03*
+X008474Y007800D03*
+X004787Y005268D03*
+X005380Y004893D03*
+X013943Y007768D03*
+X014474Y007925D03*
+X016693Y008643D03*
+X018193Y008643D03*
+X020130Y007518D03*
 X020662Y007956D03*
 X020755Y008362D03*
 X021130Y008419D03*
 X021912Y008393D03*
-X018193Y008643D03*
-X016693Y008643D03*
-X013755Y007831D03*
-X013443Y007768D03*
-X009693Y007956D03*
-X008912Y008018D03*
-X009068Y008550D03*
-X006568Y008362D03*
-X006193Y008268D03*
-X006193Y007956D03*
-X006193Y007643D03*
-X005943Y007331D03*
-X010505Y004737D03*
-X020630Y005081D03*
-X021130Y005112D03*
 D16*
-X020630Y005081D02*
-X020130Y004581D01*
-X013880Y004581D01*
-X013724Y004737D01*
-X013412Y004737D01*
-X014193Y005143D02*
-X014318Y005268D01*
-X018943Y005268D01*
-X020068Y006393D01*
-X019818Y006362D02*
-X019818Y006637D01*
-X019818Y006362D02*
-X018880Y005425D01*
-X013943Y005425D01*
-X014505Y005956D02*
-X014380Y006081D01*
-X012693Y006081D01*
-X012193Y005581D01*
-X009503Y005581D01*
-X008599Y006485D01*
-X008599Y006862D01*
-X008693Y006956D01*
-X008443Y006831D02*
-X008443Y007349D01*
-X008443Y007550D01*
-X008912Y008018D01*
-X009693Y007956D02*
-X010130Y008393D01*
-X010693Y008393D01*
-X011380Y007487D02*
-X012224Y007487D01*
-X012380Y007331D01*
-X017193Y007331D01*
-X017818Y007956D01*
-X020662Y007956D01*
 X021130Y008419D02*
 X020906Y008643D01*
 X018193Y008643D01*
-X016693Y008643D02*
-X016693Y008184D01*
-X016339Y007831D01*
-X013755Y007831D01*
-X012318Y007175D02*
-X012255Y007237D01*
-X011568Y007237D01*
-X011849Y006987D02*
-X011912Y006925D01*
-X012224Y006925D01*
-X012318Y007018D01*
-X017287Y007018D01*
-X017505Y006800D01*
-X019130Y006800D01*
-X018318Y007550D02*
-X017630Y007550D01*
-X017255Y007175D01*
-X012318Y007175D01*
-X012380Y006862D02*
-X012255Y006737D01*
-X011662Y006737D01*
-X012037Y006487D02*
-X012224Y006487D01*
-X012443Y006706D01*
-X016568Y006706D01*
-X017162Y006112D01*
-X017662Y006112D01*
-X017349Y005706D02*
+X017693Y007956D02*
+X017193Y007456D01*
+X012193Y007456D01*
+X011943Y007706D01*
+X010255Y007706D01*
+X009943Y007393D01*
+X009693Y007393D01*
+X009162Y007675D02*
+X009880Y008393D01*
+X010693Y008393D01*
+X011099Y007456D02*
+X011974Y007456D01*
+X012130Y007300D01*
+X017255Y007300D01*
+X017505Y007550D01*
+X018318Y007550D01*
+X017693Y007956D02*
+X020662Y007956D01*
+X019130Y006800D02*
+X017162Y006800D01*
+X016818Y007143D01*
+X012068Y007143D01*
+X012005Y007206D01*
+X011318Y007206D01*
+X011505Y006925D02*
+X012005Y006925D01*
+X012068Y006987D01*
+X016755Y006987D01*
+X017255Y006487D01*
+X017162Y006112D02*
+X016443Y006831D01*
+X012162Y006831D01*
+X012005Y006675D01*
+X011755Y006675D01*
+X011974Y006425D02*
+X012224Y006675D01*
+X016380Y006675D01*
+X017349Y005706D01*
 X018068Y005706D01*
-X017349Y005706D02*
-X016505Y006550D01*
-X012505Y006550D01*
-X012162Y006206D01*
-X011880Y006206D01*
-X012130Y005956D02*
-X011568Y005956D01*
-X011537Y005987D01*
-X012130Y005956D02*
-X012568Y006393D01*
-X014912Y006393D01*
-X015005Y006300D01*
-X014912Y006050D02*
-X014724Y006237D01*
-X012630Y006237D01*
-X012130Y005737D01*
-X009583Y005737D01*
-X008849Y006471D01*
-X008849Y006675D01*
-X008443Y006831D02*
-X007730Y006831D01*
-X007724Y006837D01*
-X006261Y006837D01*
-X006255Y006831D01*
-X006443Y007093D02*
-X007724Y007093D01*
-X007724Y007349D02*
-X008443Y007349D01*
-X007724Y007349D02*
-X005961Y007349D01*
-X005943Y007331D01*
-X006232Y007604D02*
-X007724Y007604D01*
-X007724Y007860D02*
-X006288Y007860D01*
-X006193Y007956D01*
-X006345Y008116D02*
-X007724Y008116D01*
-X007724Y008372D02*
-X006578Y008372D01*
-X006568Y008362D01*
-X006345Y008116D02*
-X006193Y008268D01*
-X006193Y007643D02*
-X006232Y007604D01*
-X006474Y006581D02*
-X007724Y006581D01*
-X007718Y006331D02*
-X007693Y006331D01*
-X007699Y006325D01*
-X007724Y006325D01*
-X007693Y006331D02*
-X006755Y006331D01*
-X006693Y006268D01*
-X006693Y006206D01*
-X007005Y006081D02*
-X007017Y006069D01*
-X007724Y006069D01*
-X007724Y005813D02*
-X006836Y005813D01*
-X006818Y005831D01*
-X007013Y005557D02*
-X007005Y005550D01*
-X007013Y005557D02*
-X007724Y005557D01*
-X007724Y005301D02*
-X006160Y005301D01*
-X006005Y005456D01*
-X005755Y005342D02*
-X006052Y005045D01*
-X007724Y005045D01*
-X007724Y004789D02*
-X006043Y004789D01*
-X005568Y005264D01*
-X005568Y005831D01*
-X005693Y005956D01*
-X005943Y005831D02*
-X005943Y006331D01*
-X005818Y006456D01*
-X005943Y005831D02*
-X005755Y005643D01*
-X005755Y005342D01*
-X008443Y006081D02*
-X008443Y006831D01*
-X011412Y005113D02*
-X011412Y004737D01*
-X011912Y004737D02*
-X011912Y005112D01*
-X012412Y005112D02*
-X012412Y004737D01*
-X012443Y004768D01*
-X011943Y004768D02*
-X011912Y004737D01*
-X010912Y004737D02*
-X010505Y004737D01*
-X012380Y006862D02*
-X016880Y006862D01*
-X017255Y006487D01*
+X017662Y006112D02*
+X017162Y006112D01*
 X015505Y006300D02*
 X015255Y006050D01*
 X014912Y006050D01*
+X014599Y006362D01*
+X012724Y006362D01*
+X012287Y005925D01*
+X012130Y005925D01*
+X011162Y006893D01*
+X009162Y006893D01*
+X008912Y006987D02*
+X008755Y007143D01*
+X008912Y006987D02*
+X008912Y006581D01*
+X011255Y006581D01*
+X012068Y005768D01*
+X012349Y005768D01*
+X012787Y006206D01*
+X014380Y006206D01*
+X014474Y006112D01*
+X014787Y006518D02*
+X015005Y006300D01*
+X014787Y006518D02*
+X012568Y006518D01*
+X012224Y006175D01*
+X011943Y005456D02*
+X011412Y005987D01*
+X009568Y005987D01*
+X009412Y006143D01*
+X009724Y006268D02*
+X011349Y006268D01*
+X012005Y005612D01*
+X013068Y005612D01*
+X013662Y005018D01*
+X013662Y004737D01*
+X014162Y004737D02*
+X014162Y004831D01*
+X014099Y005268D02*
+X014005Y005362D01*
+X014099Y005268D02*
+X018943Y005268D01*
+X019693Y006018D01*
+X019818Y006018D01*
+X019568Y006112D02*
+X019568Y006262D01*
+X019568Y006112D02*
+X018880Y005425D01*
+X014443Y005425D01*
+X014193Y005675D01*
+X013162Y005268D02*
+X012974Y005456D01*
+X011943Y005456D01*
+X011880Y005300D02*
+X011349Y005831D01*
+X009287Y005831D01*
+X009099Y006018D01*
+X008912Y006237D02*
+X008550Y005876D01*
+X007724Y005876D01*
+X007724Y006131D02*
+X006205Y006131D01*
+X006193Y006143D01*
+X006324Y006387D02*
+X006099Y006612D01*
+X005943Y006331D02*
+X005818Y006456D01*
+X005943Y006331D02*
+X005943Y005831D01*
+X005755Y005643D01*
+X005755Y005342D01*
+X005990Y005108D01*
+X007724Y005108D01*
+X007724Y005364D02*
+X006097Y005364D01*
+X006005Y005456D01*
+X006279Y005620D02*
+X006162Y005737D01*
+X006279Y005620D02*
+X007724Y005620D01*
+X008474Y005518D02*
+X008537Y005456D01*
+X010755Y005456D01*
+X010849Y005362D01*
+X010849Y004862D01*
+X010912Y004800D01*
+X011349Y004800D01*
+X011818Y005143D02*
+X012068Y005143D01*
+X012162Y005050D01*
+X012162Y004737D01*
+X012662Y004737D02*
+X012662Y005020D01*
+X012662Y005175D01*
+X012537Y005300D01*
+X011880Y005300D01*
+X011818Y005143D02*
+X011287Y005675D01*
+X011130Y005675D01*
+X010943Y005675D01*
+X008849Y005675D01*
+X008787Y005737D01*
+X008912Y006237D02*
+X008912Y006581D01*
+X008630Y006761D02*
+X008498Y006893D01*
+X008474Y006893D01*
+X008474Y007393D01*
+X007742Y007393D01*
+X007724Y007411D01*
+X005773Y007411D01*
+X005693Y007331D01*
+X005693Y007643D02*
+X005716Y007667D01*
+X007724Y007667D01*
+X007724Y007923D02*
+X005726Y007923D01*
+X005693Y007956D01*
+X005814Y008147D02*
+X006189Y008147D01*
+X006220Y008179D01*
+X007724Y008179D01*
+X007724Y008435D02*
+X006609Y008435D01*
+X006568Y008393D01*
+X006005Y008393D01*
+X005814Y008147D02*
+X005693Y008268D01*
+X006474Y007155D02*
+X007724Y007155D01*
+X007724Y006899D02*
+X007730Y006893D01*
+X008474Y006893D01*
+X008630Y006761D02*
+X008630Y006300D01*
+X008380Y006643D02*
+X007724Y006643D01*
+X007730Y006893D02*
+X005818Y006893D01*
+X005755Y006831D01*
+X006324Y006387D02*
+X007724Y006387D01*
+X008474Y007393D02*
+X008474Y007800D01*
+X005693Y005956D02*
+X005568Y005831D01*
+X005568Y005264D01*
+X005980Y004852D01*
+X007724Y004852D01*
+X011130Y005393D02*
+X011130Y005675D01*
+X013162Y005268D02*
+X013162Y004737D01*
+X014662Y004737D02*
+X014818Y004581D01*
+X020130Y004581D01*
+X020630Y005081D01*
+X016693Y008184D02*
+X016433Y007925D01*
+X014474Y007925D01*
+X016693Y008184D02*
+X016693Y008643D01*
 M02*
diff --git a/CAM/zoncoffee.GBO b/CAM/zoncoffee.GBO
--- a/CAM/zoncoffee.GBO
+++ b/CAM/zoncoffee.GBO
@@ -1628,90 +1628,108 @@ X021980Y004578D02*
 X021980Y004848D01*
 X021845Y004848D01*
 X021800Y004803D01*
-X013662Y004785D02*
-X013162Y004785D01*
-X013162Y004833D02*
-X013662Y004833D01*
-X013662Y004882D02*
-X013162Y004882D01*
-X013162Y004930D02*
-X013662Y004930D01*
-X013662Y004979D02*
-X013162Y004979D01*
-X013162Y004987D02*
-X013662Y004987D01*
-X013662Y004487D01*
-X013162Y004487D01*
-X013162Y004987D01*
-X013162Y004736D02*
-X013662Y004736D01*
-X013662Y004688D02*
-X013162Y004688D01*
-X013162Y004639D02*
-X013662Y004639D01*
-X013662Y004591D02*
-X013162Y004591D01*
-X013162Y004542D02*
-X013662Y004542D01*
-X013662Y004494D02*
-X013162Y004494D01*
-X013662Y004487D02*
-X010662Y004487D01*
-X010662Y004987D01*
-X013662Y004987D01*
-X013662Y004487D01*
-X010518Y003847D02*
-X010518Y006110D01*
-X008352Y006110D01*
-X008352Y003847D01*
-X010518Y003847D01*
-X010518Y003551D01*
-X008352Y003551D01*
-X008352Y003847D01*
-X004894Y005387D02*
-X004894Y005567D01*
-X004849Y005567D01*
-X004669Y005387D01*
-X004624Y005387D01*
-X004624Y005567D01*
-X004669Y005682D02*
-X004624Y005727D01*
-X004624Y005817D01*
-X004669Y005862D01*
-X004759Y005862D01*
-X004804Y005817D01*
-X004804Y005727D01*
-X004759Y005682D01*
-X004669Y005682D01*
-X004624Y005976D02*
-X004804Y005976D01*
-X004804Y006111D01*
-X004759Y006157D01*
-X004624Y006157D01*
-X004669Y006271D02*
-X004624Y006316D01*
-X004624Y006451D01*
-X004669Y006566D02*
-X004624Y006611D01*
-X004624Y006746D01*
-X004759Y006746D01*
-X004804Y006701D01*
-X004804Y006611D01*
-X004714Y006611D02*
-X004714Y006746D01*
-X004714Y006611D02*
-X004669Y006566D01*
-X004804Y006451D02*
-X004804Y006316D01*
-X004759Y006271D01*
-X004669Y006271D01*
-X004624Y007155D02*
+X015662Y004737D02*
+X015162Y004737D01*
+X015287Y004612D01*
+X015162Y004737D02*
+X015287Y004862D01*
+X014912Y004882D02*
+X014412Y004882D01*
+X014412Y004930D02*
+X014912Y004930D01*
+X014912Y004979D02*
+X014412Y004979D01*
+X014412Y004987D02*
+X014912Y004987D01*
+X014912Y004487D01*
+X014412Y004487D01*
+X014412Y004987D01*
+X014412Y004833D02*
+X014912Y004833D01*
+X014912Y004785D02*
+X014412Y004785D01*
+X014412Y004736D02*
+X014912Y004736D01*
+X014912Y004688D02*
+X014412Y004688D01*
+X014412Y004639D02*
+X014912Y004639D01*
+X014912Y004591D02*
+X014412Y004591D01*
+X014412Y004542D02*
+X014912Y004542D01*
+X014912Y004494D02*
+X014412Y004494D01*
+X014912Y004487D02*
+X011912Y004487D01*
+X011912Y004987D01*
+X014912Y004987D01*
+X014912Y004487D01*
+X011924Y003815D02*
+X011924Y006079D01*
+X009759Y006079D01*
+X009759Y003815D01*
+X011924Y003815D01*
+X011924Y003520D01*
+X009759Y003520D01*
+X009759Y003815D01*
+X010189Y006223D02*
+X010369Y006403D01*
+X010475Y006403D02*
+X010565Y006403D01*
+X010520Y006448D02*
+X010520Y006268D01*
+X010475Y006223D01*
+X010369Y006223D02*
+X010189Y006403D01*
+X010433Y006706D02*
+X010433Y006886D01*
+X010343Y006796D02*
+X010523Y006796D01*
+X010780Y006764D02*
+X010825Y006719D01*
+X010961Y006719D01*
+X010915Y006809D02*
+X010961Y006855D01*
+X010915Y006900D01*
+X010780Y006900D01*
+X010825Y006809D02*
+X010780Y006764D01*
+X010825Y006809D02*
+X010915Y006809D01*
+X011075Y006764D02*
+X011120Y006719D01*
+X011255Y006719D01*
+X011210Y006809D02*
+X011120Y006809D01*
+X011075Y006764D01*
+X011075Y006900D02*
+X011210Y006900D01*
+X011255Y006855D01*
+X011210Y006809D01*
+X011370Y006809D02*
+X011460Y006719D01*
+X011505Y006719D01*
+X011370Y006719D02*
+X011370Y006900D01*
+X011687Y006827D02*
+X011867Y006827D01*
+X011521Y006403D02*
+X011521Y006223D01*
+X011521Y006313D02*
+X011430Y006403D01*
+X011385Y006403D01*
+X011275Y006403D02*
+X011095Y006223D01*
+X011275Y006223D02*
+X011095Y006403D01*
+X004894Y007200D02*
+X004849Y007155D01*
+X004894Y007200D02*
+X004894Y007290D01*
+X004849Y007335D01*
 X004804Y007335D01*
-X004849Y007335D01*
-X004894Y007290D01*
-X004894Y007200D01*
-X004849Y007155D01*
-X004624Y007155D02*
+X004624Y007155D01*
 X004624Y007335D01*
 X004669Y007450D02*
 X004624Y007495D01*
@@ -1733,202 +1751,177 @@ X004759Y008219D01*
 X004624Y008174D02*
 X004894Y008174D01*
 X004759Y008039D01*
-X008845Y006466D02*
-X009025Y006286D01*
-X009131Y006286D02*
-X009176Y006331D01*
-X009176Y006511D01*
-X009221Y006466D02*
-X009131Y006466D01*
-X009025Y006466D02*
-X008845Y006286D01*
-X009689Y006286D02*
-X009869Y006466D01*
-X009979Y006466D02*
-X010024Y006466D01*
-X010114Y006376D01*
-X010114Y006286D02*
-X010114Y006466D01*
-X009869Y006286D02*
-X009689Y006466D01*
-X010343Y006796D02*
-X010523Y006796D01*
-X010433Y006706D02*
-X010433Y006886D01*
-X010780Y006900D02*
-X010915Y006900D01*
-X010961Y006855D01*
-X010915Y006809D01*
-X010825Y006809D01*
-X010780Y006764D01*
-X010825Y006719D01*
-X010961Y006719D01*
-X011075Y006764D02*
-X011120Y006719D01*
-X011255Y006719D01*
-X011210Y006809D02*
-X011120Y006809D01*
-X011075Y006764D01*
-X011075Y006900D02*
-X011210Y006900D01*
-X011255Y006855D01*
-X011210Y006809D01*
-X011370Y006809D02*
-X011460Y006719D01*
-X011505Y006719D01*
-X011370Y006719D02*
-X011370Y006900D01*
-X011687Y006827D02*
-X011867Y006827D01*
+X004759Y006746D02*
+X004624Y006746D01*
+X004624Y006611D01*
+X004669Y006566D01*
+X004714Y006611D01*
+X004714Y006746D01*
+X004759Y006746D02*
+X004804Y006701D01*
+X004804Y006611D01*
+X004804Y006451D02*
+X004804Y006316D01*
+X004759Y006271D01*
+X004669Y006271D01*
+X004624Y006316D01*
+X004624Y006451D01*
+X004624Y006157D02*
+X004759Y006157D01*
+X004804Y006111D01*
+X004804Y005976D01*
+X004624Y005976D01*
+X004669Y005862D02*
+X004624Y005817D01*
+X004624Y005727D01*
+X004669Y005682D01*
+X004759Y005682D01*
+X004804Y005727D01*
+X004804Y005817D01*
+X004759Y005862D01*
+X004669Y005862D01*
+X004624Y005567D02*
+X004624Y005387D01*
+X004669Y005387D01*
+X004849Y005567D01*
+X004894Y005567D01*
+X004894Y005387D01*
 D12*
-X013404Y005863D03*
-X013404Y005743D03*
-X013404Y005723D03*
-X013404Y005703D03*
-X013404Y005683D03*
-X013404Y005663D03*
-X013404Y005643D03*
-X013404Y005623D03*
-X013404Y005603D03*
-X013404Y005583D03*
-X013404Y005563D03*
-X013404Y005543D03*
-X013404Y005523D03*
-X013404Y005503D03*
-X013404Y005483D03*
-X013404Y005463D03*
-X013404Y005443D03*
-X013404Y005423D03*
-X013404Y005403D03*
 X013404Y005383D03*
 X013404Y005363D03*
 X013404Y005343D03*
-X013924Y005443D03*
-X013944Y005483D03*
-X013964Y005543D03*
-X013964Y005563D03*
-X013964Y005583D03*
-X013964Y005603D03*
-X013964Y005623D03*
-X013944Y005723D03*
-X013944Y005743D03*
-X013924Y005763D03*
+X013404Y005403D03*
+X013404Y005423D03*
+X013404Y005443D03*
+X013404Y005463D03*
+X013404Y005483D03*
+X013404Y005503D03*
+X013404Y005523D03*
+X013404Y005543D03*
+X013404Y005563D03*
+X013404Y005583D03*
+X013404Y005603D03*
+X013404Y005623D03*
+X013404Y005643D03*
+X013404Y005663D03*
+X013404Y005683D03*
+X013404Y005703D03*
+X013404Y005723D03*
+X013404Y005743D03*
+X013404Y005863D03*
 X013644Y005763D03*
 X013644Y005743D03*
 X013624Y005703D03*
-X014204Y005703D03*
-X014204Y005683D03*
-X014204Y005663D03*
-X014204Y005643D03*
-X014204Y005623D03*
-X014204Y005603D03*
-X014204Y005583D03*
-X014204Y005563D03*
-X014204Y005543D03*
-X014204Y005523D03*
-X014204Y005503D03*
-X014204Y005483D03*
-X014204Y005463D03*
-X014204Y005443D03*
+X013924Y005763D03*
+X013944Y005743D03*
+X013944Y005723D03*
+X013964Y005623D03*
+X013964Y005603D03*
+X013964Y005583D03*
+X013964Y005563D03*
+X013964Y005543D03*
+X013944Y005483D03*
+X013924Y005443D03*
 X014184Y005403D03*
 X014184Y005383D03*
 X014184Y005363D03*
+X014204Y005443D03*
+X014204Y005463D03*
+X014204Y005483D03*
+X014204Y005503D03*
+X014204Y005523D03*
+X014204Y005543D03*
+X014204Y005563D03*
+X014204Y005583D03*
+X014204Y005603D03*
+X014204Y005623D03*
+X014204Y005643D03*
+X014204Y005663D03*
+X014204Y005683D03*
+X014204Y005703D03*
+X014204Y005723D03*
+X014204Y005743D03*
+X014204Y005763D03*
+X014204Y005783D03*
+X014204Y005803D03*
+X014204Y005823D03*
+X014204Y005843D03*
+X014204Y005863D03*
+X014204Y005883D03*
+X014204Y005903D03*
+X014204Y005923D03*
+X014204Y005943D03*
+X014204Y005963D03*
+X014204Y005983D03*
+X014204Y006003D03*
+X014204Y006023D03*
+X014204Y006043D03*
+X014204Y006063D03*
+X014204Y006083D03*
+X014204Y006103D03*
+X014464Y006103D03*
+X014464Y006083D03*
+X014464Y006063D03*
+X014464Y006043D03*
+X014464Y006023D03*
+X014464Y006003D03*
+X014464Y005983D03*
+X014464Y005963D03*
+X014464Y005943D03*
+X014464Y005923D03*
+X014464Y005903D03*
+X014464Y005883D03*
+X014464Y005863D03*
+X014464Y005843D03*
+X014464Y005823D03*
+X014464Y005803D03*
+X014464Y005783D03*
+X014464Y005763D03*
+X014464Y005743D03*
+X014464Y005723D03*
+X014464Y005703D03*
+X014464Y005683D03*
+X014464Y005663D03*
+X014464Y005643D03*
+X014464Y005623D03*
+X014464Y005603D03*
+X014464Y005583D03*
+X014464Y005563D03*
+X014464Y005543D03*
+X014464Y005523D03*
+X014464Y005503D03*
+X014464Y005483D03*
+X014464Y005463D03*
+X014464Y005443D03*
+X014464Y005423D03*
+X014464Y005403D03*
 X014444Y005363D03*
 X014444Y005343D03*
-X014464Y005403D03*
-X014464Y005423D03*
-X014464Y005443D03*
-X014464Y005463D03*
-X014464Y005483D03*
-X014464Y005503D03*
-X014464Y005523D03*
-X014464Y005543D03*
-X014464Y005563D03*
-X014464Y005583D03*
-X014464Y005603D03*
-X014464Y005623D03*
-X014464Y005643D03*
-X014464Y005663D03*
-X014464Y005683D03*
-X014464Y005703D03*
-X014464Y005723D03*
-X014464Y005743D03*
-X014464Y005763D03*
-X014464Y005783D03*
-X014464Y005803D03*
-X014464Y005823D03*
-X014464Y005843D03*
-X014464Y005863D03*
-X014464Y005883D03*
-X014464Y005903D03*
-X014464Y005923D03*
-X014464Y005943D03*
-X014464Y005963D03*
-X014464Y005983D03*
-X014464Y006003D03*
-X014464Y006023D03*
-X014464Y006043D03*
-X014464Y006063D03*
-X014464Y006083D03*
-X014464Y006103D03*
-X014204Y006103D03*
-X014204Y006083D03*
-X014204Y006063D03*
-X014204Y006043D03*
-X014204Y006023D03*
-X014204Y006003D03*
-X014204Y005983D03*
-X014204Y005963D03*
-X014204Y005943D03*
-X014204Y005923D03*
-X014204Y005903D03*
-X014204Y005883D03*
-X014204Y005863D03*
-X014204Y005843D03*
-X014204Y005823D03*
-X014204Y005803D03*
-X014204Y005783D03*
-X014204Y005763D03*
-X014204Y005743D03*
-X014204Y005723D03*
+X014724Y005463D03*
+X014724Y005483D03*
+X014744Y005443D03*
+X014704Y005523D03*
+X014704Y005543D03*
+X014704Y005563D03*
+X014704Y005583D03*
+X014704Y005603D03*
+X014704Y005623D03*
+X014704Y005643D03*
+X014704Y005663D03*
 X014704Y005683D03*
-X014704Y005663D03*
-X014704Y005643D03*
-X014704Y005623D03*
-X014704Y005603D03*
-X014704Y005583D03*
-X014704Y005563D03*
-X014704Y005543D03*
-X014704Y005523D03*
-X014724Y005483D03*
-X014724Y005463D03*
-X014744Y005443D03*
-X015024Y005463D03*
-X015024Y005483D03*
-X015044Y005523D03*
-X015044Y005543D03*
-X015044Y005563D03*
-X015044Y005583D03*
-X015044Y005623D03*
+X014724Y005723D03*
+X014724Y005743D03*
+X015024Y005743D03*
+X015044Y005683D03*
+X015044Y005663D03*
 X015044Y005643D03*
-X015044Y005663D03*
-X015044Y005683D03*
-X015024Y005743D03*
-X014724Y005743D03*
-X014724Y005723D03*
-X015364Y005723D03*
-X015364Y005703D03*
-X015364Y005683D03*
-X015364Y005663D03*
-X015364Y005643D03*
-X015364Y005623D03*
-X015364Y005603D03*
-X015364Y005583D03*
-X015364Y005563D03*
-X015364Y005543D03*
-X015364Y005523D03*
-X015364Y005503D03*
-X015364Y005483D03*
+X015044Y005623D03*
+X015044Y005583D03*
+X015044Y005563D03*
+X015044Y005543D03*
+X015044Y005523D03*
+X015024Y005483D03*
+X015024Y005463D03*
 X015364Y005463D03*
 X015364Y005443D03*
 X015364Y005423D03*
@@ -1936,132 +1929,160 @@ X015364Y005403D03*
 X015364Y005383D03*
 X015364Y005363D03*
 X015364Y005343D03*
-X015704Y005423D03*
-X015704Y005443D03*
-X015704Y005463D03*
-X015704Y005483D03*
-X015704Y005503D03*
-X015704Y005523D03*
-X015704Y005543D03*
-X015704Y005563D03*
-X015704Y005583D03*
-X015704Y005603D03*
-X015704Y005623D03*
-X015704Y005643D03*
-X015704Y005663D03*
-X015704Y005683D03*
-X015704Y005703D03*
-X015704Y005723D03*
-X015704Y005743D03*
-X015704Y005763D03*
-X015704Y005783D03*
-X015704Y005803D03*
+X015364Y005483D03*
+X015364Y005503D03*
+X015364Y005523D03*
+X015364Y005543D03*
+X015364Y005563D03*
+X015364Y005583D03*
+X015364Y005603D03*
+X015364Y005623D03*
+X015364Y005643D03*
+X015364Y005663D03*
+X015364Y005683D03*
+X015364Y005703D03*
+X015364Y005723D03*
+X015364Y005743D03*
+X015364Y005763D03*
+X015364Y005863D03*
 X015704Y005883D03*
 X015704Y005903D03*
 X015704Y005923D03*
 X015704Y005943D03*
 X015704Y005963D03*
-X015364Y005863D03*
-X015364Y005763D03*
-X015364Y005743D03*
-X015984Y005743D03*
-X015984Y005723D03*
-X015984Y005703D03*
-X015984Y005683D03*
-X015984Y005663D03*
-X015984Y005643D03*
-X015984Y005623D03*
-X015984Y005603D03*
-X015984Y005583D03*
-X015984Y005563D03*
-X015984Y005543D03*
-X015984Y005523D03*
-X015984Y005503D03*
-X015984Y005483D03*
-X015984Y005463D03*
-X015984Y005443D03*
+X015704Y005803D03*
+X015704Y005783D03*
+X015704Y005763D03*
+X015704Y005743D03*
+X015704Y005723D03*
+X015704Y005703D03*
+X015704Y005683D03*
+X015704Y005663D03*
+X015704Y005643D03*
+X015704Y005623D03*
+X015704Y005603D03*
+X015704Y005583D03*
+X015704Y005563D03*
+X015704Y005543D03*
+X015704Y005523D03*
+X015704Y005503D03*
+X015704Y005483D03*
+X015704Y005463D03*
+X015704Y005443D03*
+X015704Y005423D03*
 X015984Y005423D03*
 X015984Y005403D03*
 X015984Y005383D03*
 X015984Y005363D03*
 X015984Y005343D03*
-X016304Y005343D03*
-X016304Y005363D03*
-X016304Y005383D03*
-X016304Y005403D03*
-X016304Y005423D03*
-X016304Y005443D03*
-X016304Y005463D03*
-X016304Y005483D03*
-X016304Y005503D03*
-X016304Y005523D03*
-X016304Y005543D03*
-X016304Y005563D03*
-X016304Y005583D03*
-X016304Y005603D03*
-X016304Y005623D03*
-X016304Y005643D03*
-X016304Y005663D03*
-X016304Y005683D03*
+X015984Y005443D03*
+X015984Y005463D03*
+X015984Y005483D03*
+X015984Y005503D03*
+X015984Y005523D03*
+X015984Y005543D03*
+X015984Y005563D03*
+X015984Y005583D03*
+X015984Y005603D03*
+X015984Y005623D03*
+X015984Y005643D03*
+X015984Y005663D03*
+X015984Y005683D03*
+X015984Y005703D03*
+X015984Y005723D03*
+X015984Y005743D03*
+X015984Y005763D03*
+X015984Y005783D03*
+X016304Y005763D03*
+X016304Y005743D03*
+X016304Y005723D03*
 X016304Y005703D03*
-X016304Y005723D03*
-X016304Y005743D03*
-X016304Y005763D03*
-X016304Y005863D03*
-X016564Y005743D03*
-X016564Y005723D03*
-X016544Y005683D03*
-X016544Y005663D03*
-X016544Y005643D03*
+X016304Y005683D03*
+X016304Y005663D03*
+X016304Y005643D03*
+X016304Y005623D03*
+X016304Y005603D03*
+X016304Y005583D03*
+X016304Y005563D03*
+X016304Y005543D03*
+X016304Y005523D03*
+X016304Y005503D03*
+X016304Y005483D03*
+X016304Y005463D03*
+X016304Y005443D03*
+X016304Y005423D03*
+X016304Y005403D03*
+X016304Y005383D03*
+X016304Y005363D03*
+X016304Y005343D03*
+X016564Y005463D03*
+X016564Y005483D03*
+X016544Y005523D03*
+X016544Y005543D03*
+X016544Y005563D03*
+X016544Y005583D03*
+X016544Y005603D03*
 X016544Y005623D03*
-X016544Y005603D03*
-X016544Y005583D03*
-X016544Y005563D03*
-X016544Y005543D03*
-X016544Y005523D03*
-X016564Y005483D03*
-X016564Y005463D03*
-X016864Y005463D03*
-X016864Y005483D03*
+X016544Y005643D03*
+X016544Y005663D03*
+X016544Y005683D03*
+X016564Y005723D03*
+X016564Y005743D03*
+X016304Y005863D03*
+X016864Y005743D03*
+X016864Y005723D03*
+X016884Y005683D03*
+X016884Y005663D03*
+X016884Y005643D03*
+X016884Y005623D03*
+X016884Y005603D03*
+X016884Y005583D03*
+X016884Y005563D03*
+X016884Y005543D03*
 X016884Y005523D03*
-X016884Y005543D03*
-X016884Y005563D03*
-X016884Y005583D03*
-X016884Y005603D03*
-X016884Y005623D03*
-X016884Y005643D03*
-X016884Y005663D03*
-X016884Y005683D03*
-X016864Y005723D03*
-X016864Y005743D03*
-X017304Y005783D03*
-X017324Y005763D03*
-X017324Y005743D03*
-X017344Y005703D03*
-X017344Y005683D03*
-X017344Y005663D03*
-X017344Y005643D03*
-X017344Y005563D03*
+X016864Y005483D03*
+X016864Y005463D03*
+X017304Y005423D03*
+X017324Y005463D03*
+X017344Y005503D03*
+X017344Y005523D03*
 X017344Y005543D03*
-X017344Y005523D03*
-X017344Y005503D03*
-X017324Y005463D03*
-X017304Y005423D03*
-X017904Y005343D03*
-X017924Y005383D03*
-X018244Y005443D03*
-X018264Y005503D03*
-X018264Y005523D03*
-X018264Y005543D03*
-X018264Y005603D03*
-X018264Y005623D03*
-X018264Y005643D03*
-X018264Y005663D03*
-X018264Y005683D03*
-X018264Y005703D03*
-X018244Y005723D03*
-X018244Y005743D03*
-X018224Y005783D03*
+X017344Y005563D03*
+X017344Y005643D03*
+X017344Y005663D03*
+X017344Y005683D03*
+X017344Y005703D03*
+X017324Y005743D03*
+X017324Y005763D03*
+X017304Y005783D03*
+X017924Y005783D03*
+X017924Y005763D03*
+X017924Y005743D03*
+X017924Y005723D03*
+X017924Y005703D03*
+X017924Y005683D03*
+X017924Y005663D03*
+X017924Y005643D03*
+X017924Y005623D03*
+X017924Y005603D03*
+X017924Y005583D03*
+X017924Y005563D03*
+X017924Y005803D03*
+X017924Y005903D03*
+X017924Y005923D03*
+X017924Y005943D03*
+X017924Y005963D03*
+X017924Y005983D03*
+X017924Y006003D03*
+X017924Y006023D03*
+X017924Y006043D03*
+X017924Y006063D03*
+X017924Y006083D03*
+X017924Y006103D03*
+X018504Y005863D03*
+X018504Y005843D03*
+X018504Y005823D03*
+X018504Y005803D03*
 X018504Y005783D03*
 X018504Y005763D03*
 X018504Y005743D03*
@@ -2085,48 +2106,31 @@ X018504Y005403D03*
 X018504Y005383D03*
 X018504Y005363D03*
 X018504Y005343D03*
-X018764Y005463D03*
-X018764Y005483D03*
-X018764Y005503D03*
-X018744Y005543D03*
-X018744Y005563D03*
-X018744Y005583D03*
-X018744Y005603D03*
-X018744Y005623D03*
-X018744Y005643D03*
-X018744Y005663D03*
-X018744Y005683D03*
+X018244Y005443D03*
+X018264Y005503D03*
+X018264Y005523D03*
+X018264Y005543D03*
+X018264Y005603D03*
+X018264Y005623D03*
+X018264Y005643D03*
+X018264Y005663D03*
+X018264Y005683D03*
+X018264Y005703D03*
+X018244Y005723D03*
+X018244Y005743D03*
+X018224Y005783D03*
 X018744Y005703D03*
-X018764Y005743D03*
-X018764Y005763D03*
-X018504Y005803D03*
-X018504Y005823D03*
-X018504Y005843D03*
-X018504Y005863D03*
-X017924Y005903D03*
-X017924Y005923D03*
-X017924Y005943D03*
-X017924Y005963D03*
-X017924Y005983D03*
-X017924Y006003D03*
-X017924Y006023D03*
-X017924Y006043D03*
-X017924Y006063D03*
-X017924Y006083D03*
-X017924Y006103D03*
-X017924Y005803D03*
-X017924Y005783D03*
-X017924Y005763D03*
-X017924Y005743D03*
-X017924Y005723D03*
-X017924Y005703D03*
-X017924Y005683D03*
-X017924Y005663D03*
-X017924Y005643D03*
-X017924Y005623D03*
-X017924Y005603D03*
-X017924Y005583D03*
-X017924Y005563D03*
+X018744Y005683D03*
+X018744Y005663D03*
+X018744Y005643D03*
+X018744Y005623D03*
+X018744Y005603D03*
+X018744Y005583D03*
+X018744Y005563D03*
+X018744Y005543D03*
+X018764Y005503D03*
+X018764Y005483D03*
+X018764Y005463D03*
 X018784Y005423D03*
 X018984Y005383D03*
 X019084Y005383D03*
@@ -2156,42 +2160,62 @@ X019084Y005723D03*
 X019084Y005743D03*
 X019084Y005763D03*
 X019084Y005863D03*
-X019664Y005663D03*
-X019664Y005643D03*
-X019664Y005623D03*
-X019664Y005603D03*
-X019664Y005583D03*
-X019664Y005563D03*
+X018764Y005763D03*
+X018764Y005743D03*
+X017924Y005383D03*
+X017904Y005343D03*
 X019664Y005543D03*
-X019684Y005503D03*
-X019684Y005483D03*
-X019704Y005443D03*
-X019964Y005423D03*
-X019984Y005463D03*
-X020004Y005503D03*
-X020004Y005523D03*
-X020004Y005543D03*
-X020004Y005563D03*
-X020024Y005603D03*
+X019664Y005563D03*
+X019664Y005583D03*
+X019664Y005603D03*
+X019664Y005623D03*
+X019664Y005643D03*
+X019664Y005663D03*
+X019684Y005723D03*
+X019704Y005763D03*
+X019964Y005783D03*
+X019984Y005743D03*
+X020004Y005703D03*
+X020004Y005683D03*
 X020004Y005663D03*
-X020004Y005683D03*
-X020004Y005703D03*
-X019984Y005743D03*
-X019964Y005783D03*
-X019704Y005763D03*
-X019684Y005723D03*
-X020784Y005783D03*
-X020804Y005763D03*
+X020024Y005603D03*
+X020004Y005563D03*
+X020004Y005543D03*
+X020004Y005523D03*
+X020004Y005503D03*
+X019984Y005463D03*
+X019964Y005423D03*
+X019704Y005443D03*
+X019684Y005483D03*
+X019684Y005503D03*
+X020804Y005463D03*
+X020824Y005503D03*
+X020824Y005523D03*
+X020824Y005543D03*
+X020824Y005563D03*
+X020824Y005643D03*
+X020824Y005663D03*
+X020824Y005683D03*
+X020824Y005703D03*
 X020804Y005743D03*
-X020824Y005703D03*
-X020824Y005683D03*
-X020824Y005663D03*
-X020824Y005643D03*
-X020824Y005563D03*
-X020824Y005543D03*
-X020824Y005523D03*
-X020824Y005503D03*
-X020804Y005463D03*
+X020804Y005763D03*
+X020784Y005783D03*
+X021064Y005783D03*
+X021064Y005763D03*
+X021064Y005743D03*
+X021064Y005723D03*
+X021064Y005703D03*
+X021064Y005683D03*
+X021064Y005663D03*
+X021064Y005643D03*
+X021064Y005623D03*
+X021064Y005603D03*
+X021064Y005583D03*
+X021064Y005563D03*
+X021064Y005543D03*
+X021064Y005523D03*
+X021064Y005503D03*
+X021064Y005483D03*
 X021064Y005463D03*
 X021064Y005443D03*
 X021064Y005423D03*
@@ -2199,94 +2223,78 @@ X021064Y005403D03*
 X021064Y005383D03*
 X021064Y005363D03*
 X021064Y005343D03*
-X021064Y005483D03*
-X021064Y005503D03*
-X021064Y005523D03*
-X021064Y005543D03*
-X021064Y005563D03*
-X021064Y005583D03*
-X021064Y005603D03*
-X021064Y005623D03*
-X021064Y005643D03*
-X021064Y005663D03*
-X021064Y005683D03*
-X021064Y005703D03*
-X021064Y005723D03*
-X021064Y005743D03*
-X021064Y005763D03*
-X021064Y005783D03*
+X021344Y005343D03*
+X021344Y005363D03*
+X021344Y005383D03*
+X021344Y005403D03*
+X021344Y005423D03*
+X021344Y005443D03*
+X021344Y005463D03*
+X021344Y005483D03*
+X021344Y005503D03*
+X021344Y005523D03*
+X021344Y005543D03*
+X021344Y005563D03*
+X021344Y005583D03*
+X021344Y005603D03*
+X021344Y005623D03*
+X021344Y005643D03*
+X021344Y005663D03*
+X021344Y005683D03*
+X021344Y005703D03*
+X021344Y005723D03*
+X021344Y005743D03*
+X021344Y005763D03*
+X021344Y005783D03*
+X021344Y005803D03*
 X021064Y005803D03*
 X021064Y005823D03*
 X021064Y005843D03*
 X021064Y005863D03*
-X021344Y005803D03*
-X021344Y005783D03*
-X021344Y005763D03*
-X021344Y005743D03*
-X021344Y005723D03*
-X021344Y005703D03*
-X021344Y005683D03*
-X021344Y005663D03*
-X021344Y005643D03*
-X021344Y005623D03*
-X021344Y005603D03*
-X021344Y005583D03*
-X021344Y005563D03*
-X021344Y005543D03*
-X021344Y005523D03*
-X021344Y005503D03*
-X021344Y005483D03*
-X021344Y005463D03*
-X021344Y005443D03*
-X021344Y005423D03*
-X021344Y005403D03*
-X021344Y005383D03*
-X021344Y005363D03*
-X021344Y005343D03*
-X021644Y005343D03*
-X021644Y005363D03*
-X021644Y005383D03*
-X021644Y005403D03*
-X021644Y005423D03*
-X021644Y005443D03*
-X021644Y005463D03*
-X021644Y005483D03*
-X021644Y005503D03*
+X021644Y005763D03*
+X021644Y005743D03*
+X021644Y005723D03*
+X021644Y005703D03*
+X021644Y005683D03*
+X021644Y005663D03*
+X021644Y005643D03*
+X021644Y005623D03*
+X021644Y005603D03*
+X021644Y005583D03*
+X021644Y005563D03*
+X021644Y005543D03*
 X021644Y005523D03*
-X021644Y005543D03*
-X021644Y005563D03*
-X021644Y005583D03*
-X021644Y005603D03*
-X021644Y005623D03*
-X021644Y005643D03*
-X021644Y005663D03*
-X021644Y005683D03*
-X021644Y005703D03*
-X021644Y005723D03*
-X021644Y005743D03*
-X021644Y005763D03*
-X021944Y005763D03*
-X021944Y005743D03*
-X021944Y005723D03*
-X021944Y005703D03*
+X021644Y005503D03*
+X021644Y005483D03*
+X021644Y005463D03*
+X021644Y005443D03*
+X021644Y005423D03*
+X021644Y005403D03*
+X021644Y005383D03*
+X021644Y005363D03*
+X021644Y005343D03*
+X021944Y005343D03*
+X021944Y005363D03*
+X021944Y005383D03*
+X021944Y005403D03*
+X021944Y005423D03*
+X021944Y005443D03*
+X021944Y005463D03*
+X021944Y005483D03*
+X021944Y005503D03*
+X021944Y005523D03*
+X021944Y005543D03*
+X021944Y005563D03*
+X021944Y005583D03*
+X021944Y005603D03*
+X021944Y005623D03*
+X021944Y005643D03*
+X021944Y005663D03*
 X021944Y005683D03*
-X021944Y005663D03*
-X021944Y005643D03*
-X021944Y005623D03*
-X021944Y005603D03*
-X021944Y005583D03*
-X021944Y005563D03*
-X021944Y005543D03*
-X021944Y005523D03*
-X021944Y005503D03*
-X021944Y005483D03*
-X021944Y005463D03*
-X021944Y005443D03*
-X021944Y005423D03*
-X021944Y005403D03*
-X021944Y005383D03*
-X021944Y005363D03*
-X021944Y005343D03*
+X021944Y005703D03*
+X021944Y005723D03*
+X021944Y005743D03*
+X021944Y005763D03*
 X021944Y005863D03*
 X017584Y007343D03*
 X017264Y007323D03*
@@ -2294,24 +2302,14 @@ X017064Y007403D03*
 X016984Y007503D03*
 X016964Y007703D03*
 X017084Y007703D03*
-X015984Y005783D03*
-X015984Y005763D03*
 D13*
-X016004Y005823D03*
-X015344Y005803D03*
-X014964Y005823D03*
-X014784Y005823D03*
-X014764Y005403D03*
-X014784Y005383D03*
-X014964Y005383D03*
-X015684Y005383D03*
-X016624Y005383D03*
-X016804Y005383D03*
-X017084Y005383D03*
-X017184Y005323D03*
-X017264Y005383D03*
+X017524Y007723D03*
+X018504Y007383D03*
+X018504Y006043D03*
+X018504Y006023D03*
+X018184Y005823D03*
+X017944Y005463D03*
 X017944Y005443D03*
-X017944Y005463D03*
 X018124Y005323D03*
 X018824Y005383D03*
 X018904Y005323D03*
@@ -2328,20 +2326,28 @@ X020744Y005383D03*
 X020664Y005323D03*
 X020564Y005383D03*
 X019744Y005823D03*
-X018504Y006023D03*
-X018504Y006043D03*
-X018184Y005823D03*
 X017264Y005823D03*
 X016804Y005823D03*
 X016624Y005823D03*
-X018504Y007383D03*
-X017524Y007723D03*
-X013884Y005823D03*
-X013784Y005883D03*
+X016004Y005823D03*
+X015344Y005803D03*
+X014964Y005823D03*
+X014784Y005823D03*
+X014764Y005403D03*
+X014784Y005383D03*
+X014964Y005383D03*
+X015684Y005383D03*
+X016624Y005383D03*
+X016804Y005383D03*
+X017084Y005383D03*
+X017184Y005323D03*
+X017264Y005383D03*
+X013904Y005403D03*
+X013804Y005323D03*
 X013384Y005783D03*
 X013244Y005883D03*
-X013804Y005323D03*
-X013904Y005403D03*
+X013784Y005883D03*
+X013884Y005823D03*
 D14*
 X014474Y006283D03*
 X014474Y006303D03*
diff --git a/CAM/zoncoffee.GBP b/CAM/zoncoffee.GBP
--- a/CAM/zoncoffee.GBP
+++ b/CAM/zoncoffee.GBP
@@ -1356,26 +1356,26 @@ X020826Y009587D01*
 X020820Y009631D01*
 X020818Y009675D01*
 D11*
-X007724Y008372D03*
-X007724Y008116D03*
-X007724Y007860D03*
-X007724Y007604D03*
-X007724Y007349D03*
-X007724Y007093D03*
-X007724Y006837D03*
-X007724Y006581D03*
-X007724Y006325D03*
-X007724Y006069D03*
-X007724Y005813D03*
-X007724Y005557D03*
-X007724Y005301D03*
-X007724Y005045D03*
-X007724Y004789D03*
+X007724Y008435D03*
+X007724Y008179D03*
+X007724Y007923D03*
+X007724Y007667D03*
+X007724Y007411D03*
+X007724Y007155D03*
+X007724Y006899D03*
+X007724Y006643D03*
+X007724Y006387D03*
+X007724Y006131D03*
+X007724Y005876D03*
+X007724Y005620D03*
+X007724Y005364D03*
+X007724Y005108D03*
+X007724Y004852D03*
 D12*
-X010912Y004737D03*
-X011412Y004737D03*
-X011912Y004737D03*
-X012412Y004737D03*
-X012912Y004737D03*
-X013412Y004737D03*
+X012162Y004737D03*
+X012662Y004737D03*
+X013162Y004737D03*
+X013662Y004737D03*
+X014162Y004737D03*
+X014662Y004737D03*
 M02*
diff --git a/CAM/zoncoffee.GBS b/CAM/zoncoffee.GBS
--- a/CAM/zoncoffee.GBS
+++ b/CAM/zoncoffee.GBS
@@ -1405,29 +1405,29 @@ X013818Y008393D03*
 X012818Y008393D03*
 X011693Y008393D03*
 X010693Y008393D03*
-X009943Y004831D03*
-X008943Y004831D03*
+X010349Y004800D03*
+X011349Y004800D03*
 D16*
-X007724Y004789D03*
-X007724Y005045D03*
-X007724Y005301D03*
-X007724Y005557D03*
-X007724Y005813D03*
-X007724Y006069D03*
-X007724Y006325D03*
-X007724Y006581D03*
-X007724Y006837D03*
-X007724Y007093D03*
-X007724Y007349D03*
-X007724Y007604D03*
-X007724Y007860D03*
-X007724Y008116D03*
-X007724Y008372D03*
+X007724Y004852D03*
+X007724Y005108D03*
+X007724Y005364D03*
+X007724Y005620D03*
+X007724Y005876D03*
+X007724Y006131D03*
+X007724Y006387D03*
+X007724Y006643D03*
+X007724Y006899D03*
+X007724Y007155D03*
+X007724Y007411D03*
+X007724Y007667D03*
+X007724Y007923D03*
+X007724Y008179D03*
+X007724Y008435D03*
 D17*
-X010912Y004737D03*
-X011412Y004737D03*
-X011912Y004737D03*
-X012412Y004737D03*
-X012912Y004737D03*
-X013412Y004737D03*
+X012162Y004737D03*
+X012662Y004737D03*
+X013162Y004737D03*
+X013662Y004737D03*
+X014162Y004737D03*
+X014662Y004737D03*
 M02*
diff --git a/CAM/zoncoffee.GTL b/CAM/zoncoffee.GTL
--- a/CAM/zoncoffee.GTL
+++ b/CAM/zoncoffee.GTL
@@ -18,12 +18,14 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD18C,0.0118*%
 %ADD19R,0.0600X0.0600*%
 %ADD20R,0.0276X0.0197*%
-%ADD21R,0.0276X0.0354*%
-%ADD22R,0.0354X0.0276*%
-%ADD23C,0.0138*%
+%ADD21R,0.0433X0.0394*%
+%ADD22R,0.0276X0.0354*%
+%ADD23R,0.0354X0.0276*%
 %ADD24R,0.0276X0.0177*%
-%ADD25C,0.0240*%
-%ADD26C,0.0080*%
+%ADD25R,0.0197X0.0571*%
+%ADD26R,0.0571X0.0197*%
+%ADD27C,0.0240*%
+%ADD28C,0.0080*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1455,70 +1457,6 @@ X012569Y007030D03*
 X012943Y007030D03*
 X013317Y007030D03*
 D18*
-X011166Y007001D02*
-X011008Y007001D01*
-X011008Y007198D02*
-X011166Y007198D01*
-X011166Y007395D02*
-X011008Y007395D01*
-X010851Y007552D02*
-X010851Y007710D01*
-X010654Y007710D02*
-X010654Y007552D01*
-X010457Y007552D02*
-X010457Y007710D01*
-X010260Y007710D02*
-X010260Y007552D01*
-X010063Y007552D02*
-X010063Y007710D01*
-X009866Y007710D02*
-X009866Y007552D01*
-X009669Y007552D02*
-X009669Y007710D01*
-X009473Y007710D02*
-X009473Y007552D01*
-X009315Y007395D02*
-X009157Y007395D01*
-X009157Y007198D02*
-X009315Y007198D01*
-X009315Y007001D02*
-X009157Y007001D01*
-X009157Y006804D02*
-X009315Y006804D01*
-X009315Y006607D02*
-X009157Y006607D01*
-X009157Y006411D02*
-X009315Y006411D01*
-X009315Y006214D02*
-X009157Y006214D01*
-X009157Y006017D02*
-X009315Y006017D01*
-X009473Y005860D02*
-X009473Y005702D01*
-X009669Y005702D02*
-X009669Y005860D01*
-X009866Y005860D02*
-X009866Y005702D01*
-X010063Y005702D02*
-X010063Y005860D01*
-X010260Y005860D02*
-X010260Y005702D01*
-X010457Y005702D02*
-X010457Y005860D01*
-X010654Y005860D02*
-X010654Y005702D01*
-X010851Y005702D02*
-X010851Y005860D01*
-X011008Y006017D02*
-X011166Y006017D01*
-X011166Y006214D02*
-X011008Y006214D01*
-X011008Y006411D02*
-X011166Y006411D01*
-X011166Y006607D02*
-X011008Y006607D01*
-X011008Y006804D02*
-X011166Y006804D01*
 X019460Y008380D02*
 X019460Y008656D01*
 X019736Y008656D01*
@@ -1545,62 +1483,37 @@ X013818Y008393D03*
 X012818Y008393D03*
 X011693Y008393D03*
 X010693Y008393D03*
-X009943Y004831D03*
-X008943Y004831D03*
+X010349Y004800D03*
+X011349Y004800D03*
 D20*
 X017207Y008643D03*
 X017718Y008643D03*
 D21*
+X013309Y007675D03*
+X012639Y007675D03*
+D22*
+X012043Y007706D03*
+X011531Y007706D03*
+X014999Y007737D03*
+X015511Y007737D03*
 X019687Y008018D03*
 X020199Y008018D03*
-X015511Y007737D03*
-X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
-X010011Y008550D03*
-X009499Y008550D03*
+X013199Y005393D03*
+X012687Y005393D03*
+X006949Y008237D03*
+X006437Y008237D03*
 X005324Y008268D03*
 X004812Y008268D03*
 X004812Y007643D03*
 X005324Y007643D03*
 X005324Y005643D03*
 X004812Y005643D03*
-X007999Y005643D03*
-X008511Y005643D03*
-X012687Y005487D03*
-X013199Y005487D03*
-D22*
+X005999Y004893D03*
+X006511Y004893D03*
+D23*
 X013880Y006356D03*
 X013880Y006868D03*
-D23*
-X009542Y007326D02*
-X009542Y006086D01*
-X009542Y007326D02*
-X010782Y007326D01*
-X010782Y006086D01*
-X009542Y006086D01*
-X009542Y006223D02*
-X010782Y006223D01*
-X010782Y006360D02*
-X009542Y006360D01*
-X009542Y006497D02*
-X010782Y006497D01*
-X010782Y006634D02*
-X009542Y006634D01*
-X009542Y006771D02*
-X010782Y006771D01*
-X010782Y006908D02*
-X009542Y006908D01*
-X009542Y007045D02*
-X010782Y007045D01*
-X010782Y007182D02*
-X009542Y007182D01*
-X009542Y007319D02*
-X010782Y007319D01*
 D24*
-X005373Y007116D03*
 X005373Y006801D03*
 X005373Y006486D03*
 X005373Y006171D03*
@@ -1608,213 +1521,131 @@ X004763Y006171D03*
 X004763Y006486D03*
 X004763Y006801D03*
 X004763Y007116D03*
+X005373Y007116D03*
 D25*
-X005943Y007331D03*
-X006193Y007643D03*
-X006193Y007956D03*
-X006193Y008268D03*
-X006568Y008362D03*
-X008912Y008018D03*
-X009693Y007956D03*
-X009068Y008550D03*
-X011380Y007487D03*
-X011568Y007237D03*
-X011849Y006987D03*
-X011662Y006737D03*
-X012037Y006487D03*
-X011880Y006206D03*
-X011537Y005987D03*
-X010162Y006706D03*
-X008849Y006675D03*
-X008693Y006956D03*
-X008443Y006081D03*
-X007005Y006081D03*
-X006818Y005831D03*
-X007005Y005550D03*
+X007528Y008257D03*
+X007843Y008257D03*
+X008158Y008257D03*
+X008473Y008257D03*
+X008788Y008257D03*
+X009103Y008257D03*
+X009418Y008257D03*
+X009733Y008257D03*
+X009733Y005029D03*
+X009418Y005029D03*
+X009103Y005029D03*
+X008788Y005029D03*
+X008473Y005029D03*
+X008158Y005029D03*
+X007843Y005029D03*
+X007528Y005029D03*
+D26*
+X007016Y005541D03*
+X007016Y005856D03*
+X007016Y006171D03*
+X007016Y006486D03*
+X007016Y006801D03*
+X007016Y007116D03*
+X007016Y007431D03*
+X007016Y007746D03*
+X010245Y007746D03*
+X010245Y007431D03*
+X010245Y007116D03*
+X010245Y006801D03*
+X010245Y006486D03*
+X010245Y006171D03*
+X010245Y005856D03*
+X010245Y005541D03*
+D27*
+X011130Y005393D03*
+X012224Y006175D03*
+X011974Y006425D03*
+X011755Y006675D03*
+X011505Y006925D03*
+X011318Y007206D03*
+X011099Y007456D03*
+X009724Y007737D03*
+X009162Y007675D03*
+X009693Y007393D03*
+X009162Y006893D03*
+X008755Y007143D03*
+X008380Y006643D03*
+X008630Y006300D03*
+X009099Y006018D03*
+X009412Y006143D03*
+X009724Y006268D03*
+X008787Y005737D03*
+X008474Y005518D03*
+X006162Y005737D03*
 X006005Y005456D03*
 X005693Y005956D03*
+X006193Y006143D03*
 X005818Y006456D03*
-X006474Y006581D03*
-X006255Y006831D03*
-X006693Y006206D03*
-X008443Y005237D03*
-X010505Y004737D03*
-X011412Y005113D03*
-X011912Y005112D03*
-X012412Y005112D03*
-X012912Y005112D03*
-X013943Y005425D03*
-X014193Y005143D03*
-X014505Y005956D03*
+X006099Y006612D03*
+X005755Y006831D03*
+X005693Y007331D03*
+X005693Y007643D03*
+X005693Y007956D03*
+X005693Y008268D03*
+X006005Y008393D03*
+X006443Y008643D03*
+X008474Y007800D03*
+X004787Y005268D03*
+X005380Y004893D03*
+X012662Y005020D03*
+X013724Y005768D03*
+X014193Y005675D03*
+X014005Y005362D03*
+X014474Y006112D03*
 X015005Y006300D03*
 X015505Y006300D03*
 X016005Y006300D03*
 X017255Y006487D03*
 X017662Y006112D03*
 X018068Y005706D03*
+X019568Y006262D03*
+X019818Y006018D03*
 X019130Y006800D03*
-X018755Y007143D03*
+X018693Y007081D03*
 X018318Y007550D03*
-X019818Y006637D03*
-X020068Y006393D03*
-X020130Y007143D03*
+X020130Y007518D03*
 X020662Y007956D03*
 X020755Y008362D03*
 X021130Y008419D03*
 X021912Y008393D03*
 X018193Y008643D03*
 X016693Y008643D03*
-X013755Y007831D03*
-X013443Y007768D03*
+X014474Y007925D03*
+X013943Y007768D03*
 X020630Y005081D03*
 X021130Y005112D03*
-X004787Y005268D03*
-D26*
-X004787Y005669D01*
-X004812Y005643D01*
-X004763Y005693D01*
-X004763Y006171D01*
-X004763Y006801D01*
-X004763Y006486D01*
-X004763Y006171D01*
-X004787Y005700D02*
-X004787Y005669D01*
-X005324Y005643D02*
-X005818Y005643D01*
-X006005Y005456D01*
-X005693Y005956D02*
-X005693Y006143D01*
-X005665Y006171D01*
-X005373Y006171D01*
-X005373Y006486D02*
-X005788Y006486D01*
-X005818Y006456D01*
-X006225Y006801D02*
-X005373Y006801D01*
-X005373Y007116D02*
-X005728Y007116D01*
-X005943Y007331D01*
-X006193Y007643D02*
-X005324Y007643D01*
-X004818Y007649D02*
-X004818Y007893D01*
-X004880Y007956D01*
-X006193Y007956D01*
-X006193Y008268D02*
-X005324Y008268D01*
-X004818Y008274D02*
-X004818Y008518D01*
-X004880Y008581D01*
-X006349Y008581D01*
-X006568Y008362D01*
-X007306Y007631D02*
-X006474Y006800D01*
-X006474Y006581D01*
-X006225Y006801D02*
-X006255Y006831D01*
-X006724Y006800D02*
-X006724Y006237D01*
-X006693Y006206D01*
-X007005Y006081D02*
-X007005Y006813D01*
-X007390Y007198D01*
-X009236Y007198D01*
-X009236Y007001D02*
-X008738Y007001D01*
-X008693Y006956D01*
-X008367Y006956D01*
-X007224Y005813D01*
-X006836Y005813D01*
-X006818Y005831D01*
-X007005Y005550D02*
-X007216Y005550D01*
-X008091Y006425D01*
-X008943Y006425D01*
-X009126Y006607D01*
-X009236Y006607D01*
-X009236Y006804D02*
-X008979Y006804D01*
-X008849Y006675D01*
-X008443Y006081D02*
-X008511Y006012D01*
-X008511Y005643D01*
-X008636Y005518D01*
-X009412Y005518D01*
-X009473Y005579D01*
-X009473Y005781D01*
-X009866Y005781D02*
-X009866Y005442D01*
-X009755Y005331D01*
-X009005Y005331D01*
-X008943Y005268D01*
-X008943Y004831D01*
-X008443Y005237D02*
-X008099Y005237D01*
-X008005Y005331D01*
-X008005Y005637D01*
-X007999Y005643D01*
-X009943Y005268D02*
-X009943Y004831D01*
-X009943Y005268D02*
-X010063Y005389D01*
-X010063Y005781D01*
-X010260Y005781D02*
-X010260Y005326D01*
-X010505Y005081D01*
-X010505Y004737D01*
-X010505Y005081D02*
-X011099Y005081D01*
-X011505Y004675D01*
-X013724Y004675D01*
-X014193Y005143D01*
-X014505Y004983D02*
-X014505Y005956D01*
-X015005Y006300D02*
-X015005Y004983D01*
-X015505Y004983D02*
-X015505Y006300D01*
-X016005Y006300D02*
-X016005Y006643D01*
-X016005Y007109D01*
-X015505Y007109D02*
-X015505Y007731D01*
-X015511Y007737D01*
-X015511Y007962D01*
-X015943Y008393D01*
-X016693Y008643D02*
-X017207Y008643D01*
-X017718Y008643D02*
-X018193Y008643D01*
-X018727Y007959D02*
-X018318Y007550D01*
-X018727Y007959D02*
-X018729Y007959D01*
-X019118Y007569D02*
-X019118Y007506D01*
-X018755Y007143D01*
-X019130Y006800D02*
-X019508Y007177D01*
-X019508Y007179D01*
-X020130Y007143D02*
-X020142Y007155D01*
-X020650Y007155D01*
-X020650Y006643D02*
-X020643Y006637D01*
-X019818Y006637D01*
-X020068Y006393D02*
-X020644Y006393D01*
-X020650Y006387D01*
-X020650Y006131D02*
-X021119Y006131D01*
-X021130Y006143D01*
-X021130Y005581D01*
-X020630Y005081D01*
-X021130Y005112D02*
+D28*
 X021649Y005112D01*
 X021693Y005069D01*
 X021705Y005069D01*
-X021130Y006143D02*
-X021130Y008419D01*
+X021130Y005581D02*
+X020630Y005081D01*
+X021130Y005581D02*
+X021130Y006143D01*
+X021119Y006131D01*
+X020650Y006131D01*
+X020650Y006387D02*
+X020644Y006393D01*
+X020193Y006393D01*
+X019818Y006018D01*
+X019568Y006262D02*
+X019943Y006637D01*
+X020643Y006637D01*
+X020650Y006643D01*
+X020650Y007155D02*
+X020212Y007155D01*
+X020130Y007237D01*
+X020130Y007518D01*
+X020261Y007956D02*
+X020199Y008018D01*
+X020193Y008012D01*
+X020261Y007956D02*
+X020662Y007956D01*
 X020755Y008362D02*
 X020599Y008518D01*
 X020288Y008518D01*
@@ -1822,43 +1653,36 @@ X019687Y008429D02*
 X019598Y008518D01*
 X019687Y008429D02*
 X019687Y008018D01*
-X020193Y008012D02*
-X020199Y008018D01*
-X020261Y007956D01*
-X020662Y007956D01*
-X021693Y008218D02*
-X021705Y008206D01*
-X021755Y008206D01*
-X021755Y008237D01*
-X021912Y008393D01*
-X017662Y006112D02*
-X017267Y005718D01*
-X017627Y005328D02*
-X017657Y005328D01*
-X017690Y005328D01*
-X018068Y005706D01*
-X017255Y006485D02*
-X016877Y006107D01*
-X017255Y006485D02*
-X017255Y006487D01*
-X016005Y006643D02*
-X014443Y006643D01*
-X014156Y006356D01*
-X013880Y006356D01*
-X013437Y006425D02*
-X013880Y006868D01*
-X013880Y007081D01*
-X013943Y007143D01*
-X014471Y007143D01*
-X014505Y007109D01*
+X019118Y007569D02*
+X019118Y007506D01*
+X018693Y007081D01*
+X019130Y006800D02*
+X019508Y007177D01*
+X019508Y007179D01*
+X018727Y007959D02*
+X018318Y007550D01*
+X018727Y007959D02*
+X018729Y007959D01*
+X018193Y008643D02*
+X017718Y008643D01*
+X017207Y008643D02*
+X016693Y008643D01*
+X015943Y008393D02*
+X015511Y007962D01*
+X015511Y007737D01*
+X015505Y007731D01*
+X015505Y007109D01*
 X015005Y007109D02*
 X015005Y007731D01*
 X014999Y007737D01*
 X014999Y008337D01*
 X014943Y008393D01*
-X013755Y007831D02*
-X013755Y007287D01*
-X013498Y007030D01*
+X014474Y007925D02*
+X013943Y007393D01*
+X013818Y007393D01*
+X013568Y007143D01*
+X013318Y007143D01*
+X013317Y007142D01*
 X013317Y007030D01*
 X013317Y006705D01*
 X013255Y006643D01*
@@ -1866,131 +1690,265 @@ X012630Y006643D01*
 X012568Y006706D01*
 X012568Y007031D01*
 X012569Y007030D01*
-X012569Y007713D01*
-X012624Y007768D01*
-X012624Y008200D01*
+X012569Y007604D01*
+X012639Y007675D01*
+X012639Y008215D01*
 X012818Y008393D01*
-X012230Y008356D02*
-X012193Y008393D01*
+X012043Y008044D02*
 X011693Y008393D01*
-X012230Y008356D02*
-X012230Y007768D01*
-X011724Y007762D02*
-X011718Y007768D01*
-X011474Y007768D01*
-X011287Y007956D01*
-X010851Y007956D01*
-X010851Y007631D01*
-X010851Y007956D02*
-X010063Y007956D01*
-X010063Y008206D01*
-X009099Y008206D01*
-X008912Y008018D01*
-X009473Y007631D02*
-X007306Y007631D01*
-X007319Y007395D02*
-X006724Y006800D01*
-X007319Y007395D02*
-X009236Y007395D01*
-X009669Y007631D02*
-X009669Y007932D01*
-X009693Y007956D01*
-X010063Y007956D02*
-X010063Y007631D01*
-X010074Y007620D01*
-X010063Y008206D02*
-X010063Y008498D01*
-X010011Y008550D01*
-X009499Y008550D02*
-X009068Y008550D01*
-X011087Y007395D02*
-X011087Y007381D01*
-X011193Y007487D01*
-X011380Y007487D01*
-X011568Y007237D02*
-X011332Y007001D01*
-X011087Y007001D01*
-X011087Y007198D02*
-X010654Y007198D01*
-X010162Y006706D01*
-X011087Y006804D02*
-X011416Y006804D01*
-X011599Y006987D01*
-X011849Y006987D01*
-X011662Y006737D02*
-X011532Y006607D01*
-X011087Y006607D01*
-X011087Y006411D02*
-X011648Y006411D01*
-X011724Y006487D01*
-X012037Y006487D01*
-X012255Y006706D02*
-X012255Y007248D01*
-X012110Y007393D01*
-X011787Y007393D01*
-X011724Y007456D01*
-X011724Y007762D01*
-X012943Y007331D02*
-X013130Y007518D01*
-X013130Y007762D01*
-X013136Y007768D01*
-X013443Y007768D01*
-X012943Y007331D02*
-X012943Y007030D01*
-X012537Y006425D02*
-X012255Y006706D01*
-X012537Y006425D02*
+X012043Y008044D02*
+X012043Y007706D01*
+X011531Y007706D02*
+X011531Y007430D01*
+X012537Y006425D01*
 X013318Y006425D01*
 X013437Y006425D01*
-X013318Y006425D02*
+X013880Y006868D01*
+X013880Y007081D01*
+X013943Y007143D01*
+X014471Y007143D01*
+X014505Y007109D01*
+X014380Y006581D02*
+X014156Y006356D01*
+X013880Y006356D01*
+X014380Y006581D02*
+X016005Y006581D01*
+X016005Y006300D01*
+X015505Y006300D02*
+X015505Y004983D01*
+X015005Y004983D02*
+X015005Y006300D01*
+X014474Y006112D02*
+X014474Y005014D01*
+X014505Y004983D01*
+X014005Y005362D02*
+X013318Y004675D01*
+X012474Y004675D01*
+X011755Y005393D01*
+X011130Y005393D01*
+X010590Y005541D02*
+X011224Y006175D01*
+X012224Y006175D01*
+X011974Y006425D02*
+X011130Y006425D01*
+X010562Y005856D01*
+X010245Y005856D01*
+X010245Y006171D02*
+X010595Y006171D01*
+X011099Y006675D01*
+X011755Y006675D01*
+X011505Y006925D02*
+X011037Y006925D01*
+X010598Y006486D01*
+X010245Y006486D01*
+X010245Y006801D02*
+X010600Y006801D01*
+X011005Y007206D01*
+X011318Y007206D01*
+X011099Y007456D02*
+X010943Y007456D01*
+X010603Y007116D01*
+X010245Y007116D01*
+X010245Y007431D02*
+X010668Y007431D01*
+X010755Y007518D01*
+X010755Y007643D01*
+X010662Y007737D01*
+X010253Y007737D01*
+X010245Y007746D01*
+X009733Y007746D01*
+X009724Y007737D01*
+X009418Y007668D02*
+X009693Y007393D01*
+X009418Y007668D02*
+X009418Y008257D01*
+X009733Y008257D02*
+X009744Y008268D01*
+X009974Y008268D01*
+X010287Y007956D01*
+X011037Y007956D01*
+X011287Y007706D01*
+X011531Y007706D01*
+X012943Y007309D02*
+X012943Y007030D01*
+X012943Y007309D02*
+X013309Y007675D01*
+X013849Y007675D01*
+X013943Y007768D01*
+X016005Y007109D02*
+X016005Y006581D01*
+X016877Y006107D02*
+X017255Y006485D01*
+X017255Y006487D01*
+X017662Y006112D02*
+X017267Y005718D01*
+X017627Y005328D02*
+X017657Y005328D01*
+X017690Y005328D01*
+X018068Y005706D01*
+X021130Y006143D02*
+X021130Y008419D01*
+X021693Y008218D02*
+X021705Y008206D01*
+X021755Y008206D01*
+X021755Y008237D01*
+X021912Y008393D01*
+X014193Y005675D02*
+X013974Y005675D01*
+X013319Y005020D01*
+X012662Y005020D01*
+X012687Y005393D02*
+X012687Y005450D01*
+X013130Y005893D01*
+X013318Y005893D01*
+X013297Y005914D01*
+X013297Y005987D01*
+X013317Y006006D01*
 X013318Y006007D01*
-X013317Y006006D01*
+X013318Y006425D01*
+X013297Y005987D02*
 X013287Y005976D01*
-X013287Y005612D01*
-X013199Y005524D01*
-X013199Y005487D01*
-X012693Y005481D02*
-X012687Y005487D01*
-X012693Y005481D02*
-X012693Y005175D01*
-X012755Y005112D01*
-X012912Y005112D01*
-X012412Y005112D02*
-X012412Y005300D01*
-X012162Y005550D01*
-X010912Y005550D01*
-X010851Y005611D01*
-X010851Y005781D01*
-X010654Y005781D02*
-X010654Y005432D01*
-X010693Y005393D01*
-X011849Y005393D01*
-X011912Y005331D01*
-X011912Y005112D01*
-X011694Y004831D02*
-X011412Y005113D01*
-X011288Y005237D01*
-X010599Y005237D01*
-X010457Y005379D01*
-X010457Y005781D01*
-X011087Y006017D02*
-X011507Y006017D01*
-X011537Y005987D01*
-X011326Y006214D02*
-X011087Y006214D01*
-X011326Y006214D02*
-X011349Y006237D01*
-X011849Y006237D01*
-X011880Y006206D01*
-X011832Y006254D01*
-X013943Y005425D02*
-X013943Y005150D01*
-X013624Y004831D01*
-X011694Y004831D01*
-X004763Y006801D02*
-X004763Y007116D01*
-X004812Y007643D02*
+X013724Y005768D02*
+X013349Y005393D01*
+X013199Y005393D01*
+X010590Y005541D02*
+X010245Y005541D01*
+X009724Y005038D02*
+X009733Y005029D01*
+X009724Y005038D02*
+X009724Y006268D01*
+X009412Y006143D02*
+X009412Y005035D01*
+X009418Y005029D01*
+X009103Y005029D02*
+X009099Y005033D01*
+X009099Y006018D01*
+X008788Y005736D02*
+X008788Y005029D01*
+X008473Y005029D02*
+X008473Y005517D01*
+X008474Y005518D01*
+X008787Y005737D02*
+X008788Y005736D01*
+X008630Y006300D02*
+X008381Y006300D01*
+X007537Y005455D01*
+X007537Y005038D01*
+X007528Y005029D01*
+X007528Y004902D01*
+X007537Y004893D01*
+X006511Y004893D01*
+X006037Y004930D02*
+X005999Y004893D01*
+X005380Y004893D01*
+X006037Y004930D02*
+X006037Y005175D01*
+X006403Y005541D01*
+X007016Y005541D01*
+X006568Y006143D02*
+X006162Y005737D01*
+X006005Y005456D02*
+X005818Y005643D01*
+X005324Y005643D01*
+X004812Y005643D02*
+X004787Y005669D01*
+X004787Y005700D01*
+X004763Y005693D02*
+X004812Y005643D01*
+X004787Y005669D02*
+X004787Y005268D01*
+X004763Y005693D02*
+X004763Y006171D01*
+X004763Y006801D01*
+X004763Y006486D01*
+X004763Y006171D01*
+X005373Y006171D02*
+X005665Y006171D01*
+X005693Y006143D01*
+X005693Y005956D01*
+X006193Y006143D02*
+X006380Y006331D01*
+X006380Y007183D01*
+X006628Y007431D01*
+X007016Y007431D01*
+X007016Y007116D02*
+X008728Y007116D01*
+X008755Y007143D01*
+X009020Y007393D02*
+X009412Y007002D01*
+X009412Y006737D01*
+X009318Y006643D01*
+X008380Y006643D01*
+X008193Y006893D02*
+X009162Y006893D01*
+X009020Y007393D02*
+X007880Y007393D01*
+X007528Y007746D01*
+X007528Y008257D01*
+X007843Y008257D02*
+X007843Y007780D01*
+X008073Y007550D01*
+X009037Y007550D01*
+X009162Y007675D01*
+X008474Y007800D02*
+X008474Y008256D01*
+X008473Y008257D01*
+X008473Y008737D01*
+X007099Y008737D01*
+X006974Y008612D01*
+X006974Y008262D01*
+X006949Y008237D01*
+X006443Y008243D02*
+X006443Y008643D01*
+X006005Y008393D02*
+X005818Y008581D01*
+X004880Y008581D01*
+X004818Y008518D01*
+X004818Y008274D01*
+X004812Y008268D01*
+X005324Y008268D02*
+X005693Y008268D01*
+X005693Y007956D02*
+X004880Y007956D01*
+X004818Y007893D01*
 X004818Y007649D01*
-X004812Y008268D02*
-X004818Y008274D01*
+X004812Y007643D01*
+X005324Y007643D02*
+X005693Y007643D01*
+X005693Y007331D02*
+X005478Y007116D01*
+X005373Y007116D01*
+X005725Y006801D02*
+X005755Y006831D01*
+X005725Y006801D02*
+X005373Y006801D01*
+X005373Y006486D02*
+X005788Y006486D01*
+X005818Y006456D01*
+X006099Y006612D02*
+X006099Y007253D01*
+X006591Y007746D01*
+X007016Y007746D01*
+X006443Y008243D02*
+X006437Y008237D01*
+X004763Y007116D02*
+X004763Y006801D01*
+X006568Y006423D02*
+X006568Y006143D01*
+X006568Y006423D02*
+X006630Y006486D01*
+X007016Y006486D01*
+X007016Y006801D02*
+X008100Y006801D01*
+X008193Y006893D01*
+X009733Y008257D02*
+X009733Y008666D01*
+X009662Y008737D01*
+X008473Y008737D01*
+X008158Y005029D02*
+X008162Y005025D01*
+X008162Y004612D01*
+X008224Y004550D01*
+X010099Y004550D01*
+X010349Y004800D01*
 M02*
diff --git a/CAM/zoncoffee.GTO b/CAM/zoncoffee.GTO
--- a/CAM/zoncoffee.GTO
+++ b/CAM/zoncoffee.GTO
@@ -14,9 +14,9 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD14C,0.0020*%
 %ADD15C,0.0040*%
 %ADD16R,0.0050X0.0305*%
-%ADD17C,0.0160*%
-%ADD18R,0.0160X0.0280*%
-%ADD19R,0.0177X0.0177*%
+%ADD17C,0.0220*%
+%ADD18C,0.0160*%
+%ADD19R,0.0160X0.0280*%
 %ADD20R,0.0100X0.0020*%
 %ADD21R,0.0160X0.0020*%
 %ADD22R,0.0180X0.0020*%
@@ -33,6 +33,7 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD33R,0.0260X0.0020*%
 %ADD34R,0.0020X0.0020*%
 %ADD35R,0.0040X0.0020*%
+%ADD36C,0.0060*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1437,37 +1438,37 @@ X016255Y006800D01*
 X016255Y005300D01*
 X014255Y005300D01*
 X014255Y006800D01*
-X009543Y005406D02*
-X009498Y005361D01*
-X009318Y005361D01*
-X009363Y005316D02*
-X009363Y005406D01*
-X009363Y005205D02*
-X009363Y005160D01*
-X009453Y005070D01*
-X009543Y005070D02*
-X009363Y005070D01*
-X009408Y004956D02*
-X009543Y004956D01*
-X009543Y004820D01*
-X009498Y004775D01*
-X009453Y004820D01*
-X009453Y004956D01*
-X009408Y004956D02*
-X009363Y004911D01*
-X009363Y004820D01*
-X009363Y004661D02*
-X009543Y004661D01*
-X009543Y004526D01*
-X009498Y004481D01*
-X009363Y004481D01*
+X010949Y005468D02*
+X010904Y005423D01*
+X010724Y005423D01*
+X010769Y005378D02*
+X010769Y005468D01*
+X010769Y005268D02*
+X010769Y005223D01*
+X010859Y005133D01*
+X010949Y005133D02*
+X010769Y005133D01*
+X010814Y005018D02*
+X010949Y005018D01*
+X010949Y004883D01*
+X010904Y004838D01*
+X010859Y004883D01*
+X010859Y005018D01*
+X010814Y005018D02*
+X010769Y004973D01*
+X010769Y004883D01*
+X010769Y004723D02*
+X010949Y004723D01*
+X010949Y004588D01*
+X010904Y004543D01*
+X010769Y004543D01*
 D12*
-X012383Y006349D02*
-X012383Y006687D01*
 X012837Y006199D02*
 X013049Y006199D01*
 X013503Y006349D02*
 X013503Y006687D01*
+X012383Y006687D02*
+X012383Y006349D01*
 X015955Y007581D02*
 X015957Y007594D01*
 X015962Y007607D01*
@@ -1558,44 +1559,93 @@ X020571Y005305D01*
 X021201Y005305D01*
 X022264Y005305D02*
 X022264Y007982D01*
+X009955Y008581D02*
+X009957Y008594D01*
+X009962Y008607D01*
+X009971Y008618D01*
+X009982Y008625D01*
+X009995Y008630D01*
+X010008Y008631D01*
+X010022Y008628D01*
+X010034Y008622D01*
+X010044Y008613D01*
+X010051Y008601D01*
+X010055Y008588D01*
+X010055Y008574D01*
+X010051Y008561D01*
+X010044Y008549D01*
+X010034Y008540D01*
+X010022Y008534D01*
+X010008Y008531D01*
+X009995Y008532D01*
+X009982Y008537D01*
+X009971Y008544D01*
+X009962Y008555D01*
+X009957Y008568D01*
+X009955Y008581D01*
 D13*
-X019886Y006880D02*
-X019886Y006296D01*
-X019792Y006202D01*
-X019808Y006187D01*
-X019595Y005974D01*
-X019603Y005965D02*
-X019529Y005892D01*
-X019603Y005965D02*
+X016500Y006991D02*
+X016500Y006407D01*
+X016638Y006269D01*
+X016587Y006217D01*
+X016620Y006184D01*
+X016954Y005850D02*
+X017009Y005795D01*
+X017344Y005460D02*
+X017399Y005405D01*
+X017734Y005070D02*
+X017767Y005037D01*
+X017818Y005089D01*
+X017956Y004950D01*
+X018541Y004950D01*
+X018634Y005044D01*
+X018649Y005029D01*
+X018862Y005242D01*
+X018871Y005233D01*
+X018944Y005307D01*
+X018862Y005242D02*
+X018790Y005314D01*
+X018863Y005387D01*
+X019529Y005892D02*
+X019603Y005965D01*
 X019522Y006046D01*
 X019449Y005973D01*
-X018577Y006457D02*
-X018577Y006830D01*
-X018575Y006856D01*
-X018570Y006881D01*
-X018562Y006905D01*
-X018551Y006929D01*
-X018536Y006950D01*
-X018519Y006969D01*
-X018500Y006986D01*
-X018479Y007001D01*
-X018455Y007012D01*
-X018431Y007020D01*
-X018406Y007025D01*
-X018380Y007027D01*
-X018006Y007027D01*
-X017980Y007025D01*
-X017955Y007020D01*
-X017931Y007012D01*
-X017908Y007001D01*
-X017886Y006986D01*
-X017867Y006969D01*
-X017850Y006950D01*
-X017835Y006929D01*
-X017824Y006905D01*
-X017816Y006881D01*
-X017811Y006856D01*
-X017809Y006830D01*
+X019595Y005974D02*
+X019808Y006187D01*
+X019792Y006202D01*
+X019886Y006296D01*
+X019886Y006880D01*
+X019748Y007018D01*
+X019799Y007069D01*
+X019766Y007102D01*
+X019431Y007437D02*
+X019362Y007506D01*
+X019056Y007813D02*
+X018987Y007882D01*
+X018619Y008250D02*
+X018567Y008198D01*
+X018429Y008336D01*
+X017845Y008336D01*
+X017752Y008243D01*
+X017736Y008258D01*
+X017523Y008045D01*
+X017596Y007973D01*
+X017522Y007899D01*
+X017441Y007980D02*
+X017515Y008053D01*
+X017523Y008045D01*
+X017410Y007586D02*
+X017388Y007448D01*
+X017251Y007426D01*
+X016937Y007314D02*
+X016864Y007240D01*
+X016783Y007321D01*
+X016856Y007395D01*
+X016791Y007313D02*
+X016578Y007100D01*
+X016594Y007085D01*
+X016500Y006991D01*
+X017809Y006830D02*
 X017809Y006457D01*
 X017811Y006431D01*
 X017816Y006406D01*
@@ -1624,6 +1674,32 @@ X018562Y006382D01*
 X018570Y006406D01*
 X018575Y006431D01*
 X018577Y006457D01*
+X018577Y006830D01*
+X018575Y006856D01*
+X018570Y006881D01*
+X018562Y006905D01*
+X018551Y006929D01*
+X018536Y006950D01*
+X018519Y006969D01*
+X018500Y006986D01*
+X018479Y007001D01*
+X018455Y007012D01*
+X018431Y007020D01*
+X018406Y007025D01*
+X018380Y007027D01*
+X018006Y007027D01*
+X017980Y007025D01*
+X017955Y007020D01*
+X017931Y007012D01*
+X017908Y007001D01*
+X017886Y006986D01*
+X017867Y006969D01*
+X017850Y006950D01*
+X017835Y006929D01*
+X017824Y006905D01*
+X017816Y006881D01*
+X017811Y006856D01*
+X017809Y006830D01*
 X017469Y006643D02*
 X017471Y006696D01*
 X017477Y006750D01*
@@ -1710,61 +1786,8 @@ X017487Y006484D01*
 X017477Y006536D01*
 X017471Y006590D01*
 X017469Y006643D01*
-X016638Y006269D02*
-X016500Y006407D01*
-X016500Y006991D01*
-X016594Y007085D01*
-X016578Y007100D01*
-X016791Y007313D01*
-X016783Y007321D02*
-X016864Y007240D01*
-X016937Y007314D01*
-X016856Y007395D02*
-X016783Y007321D01*
-X017251Y007426D02*
-X017388Y007448D01*
-X017410Y007586D01*
-X017522Y007899D02*
-X017596Y007973D01*
-X017523Y008045D01*
-X017736Y008258D01*
-X017752Y008243D01*
-X017845Y008336D01*
-X018429Y008336D01*
-X018567Y008198D01*
+X018652Y008216D02*
 X018619Y008250D01*
-X018652Y008216D01*
-X018987Y007882D02*
-X019056Y007813D01*
-X019362Y007506D02*
-X019431Y007437D01*
-X019766Y007102D02*
-X019799Y007069D01*
-X019748Y007018D01*
-X019886Y006880D01*
-X017523Y008045D02*
-X017515Y008053D01*
-X017441Y007980D01*
-X016638Y006269D02*
-X016587Y006217D01*
-X016620Y006184D01*
-X016954Y005850D02*
-X017009Y005795D01*
-X017344Y005460D02*
-X017399Y005405D01*
-X017734Y005070D02*
-X017767Y005037D01*
-X017818Y005089D01*
-X017956Y004950D01*
-X018541Y004950D01*
-X018634Y005044D01*
-X018649Y005029D01*
-X018862Y005242D01*
-X018871Y005233D01*
-X018944Y005307D01*
-X018862Y005242D02*
-X018790Y005314D01*
-X018863Y005387D01*
 D14*
 X017396Y006643D02*
 X017398Y006699D01*
@@ -1980,77 +2003,65 @@ X005363Y007254D01*
 D16*
 X017413Y008641D03*
 D17*
-X015255Y007749D02*
-X015255Y007725D01*
-X013892Y006612D02*
-X013868Y006612D01*
-X012943Y005499D02*
-X012943Y005475D01*
-X012880Y007756D02*
-X012880Y007780D01*
-X011974Y007780D02*
-X011974Y007756D01*
-X009755Y008538D02*
-X009755Y008562D01*
-X005068Y008280D02*
-X005068Y008256D01*
+X012974Y007687D02*
+X012974Y007663D01*
+D18*
+X011787Y007694D02*
+X011787Y007718D01*
+X013868Y006612D02*
+X013892Y006612D01*
+X015255Y007725D02*
+X015255Y007749D01*
+X012943Y005405D02*
+X012943Y005381D01*
+X006693Y008225D02*
+X006693Y008249D01*
+X005068Y008256D02*
+X005068Y008280D01*
 X005068Y007655D02*
 X005068Y007631D01*
-X008255Y005655D02*
-X008255Y005631D01*
-D18*
+X006255Y004905D02*
+X006255Y004881D01*
+D19*
 X005068Y005643D03*
 X019943Y008018D03*
-D19*
-X011038Y007582D03*
 D20*
-X018813Y004856D03*
-X018813Y004836D03*
-X018793Y004736D03*
-X018793Y004716D03*
-X018773Y004696D03*
-X018773Y004676D03*
-X018773Y004656D03*
-X018773Y004636D03*
-X018773Y004616D03*
-X018753Y004596D03*
-X018753Y004576D03*
-X018753Y004556D03*
-X018773Y004476D03*
-X018953Y004496D03*
-X018953Y004516D03*
-X018953Y004536D03*
-X018973Y004556D03*
-X018973Y004576D03*
-X018973Y004596D03*
-X018973Y004616D03*
-X018973Y004636D03*
+X019033Y004936D03*
+X019033Y004916D03*
+X019033Y004896D03*
+X019033Y004876D03*
+X019033Y004856D03*
+X019013Y004836D03*
+X019013Y004816D03*
+X018993Y004716D03*
+X018993Y004696D03*
+X018993Y004676D03*
 X018993Y004656D03*
-X018993Y004676D03*
-X018993Y004696D03*
-X018993Y004716D03*
-X019013Y004816D03*
-X019013Y004836D03*
-X019033Y004856D03*
-X019033Y004876D03*
-X019033Y004896D03*
-X019033Y004916D03*
-X019033Y004936D03*
-X019153Y004816D03*
-X019193Y004716D03*
+X018973Y004636D03*
+X018973Y004616D03*
+X018973Y004596D03*
+X018973Y004576D03*
+X018973Y004556D03*
+X018953Y004536D03*
+X018953Y004516D03*
+X018953Y004496D03*
+X019133Y004496D03*
+X019153Y004516D03*
+X019153Y004536D03*
+X019153Y004556D03*
+X019153Y004576D03*
+X019153Y004596D03*
+X019173Y004616D03*
+X019173Y004636D03*
+X019173Y004656D03*
+X019173Y004676D03*
 X019173Y004696D03*
-X019173Y004676D03*
-X019173Y004656D03*
-X019173Y004636D03*
-X019173Y004616D03*
-X019153Y004596D03*
-X019153Y004576D03*
-X019153Y004556D03*
-X019153Y004536D03*
-X019153Y004516D03*
-X019133Y004496D03*
+X019193Y004716D03*
+X019153Y004816D03*
+X019353Y004716D03*
+X019373Y004736D03*
+X019333Y004636D03*
 X019313Y004596D03*
-X019333Y004636D03*
 X019333Y004556D03*
 X019393Y004476D03*
 X019653Y004496D03*
@@ -2068,8 +2079,10 @@ X019693Y004716D03*
 X019533Y004716D03*
 X019533Y004736D03*
 X019473Y004816D03*
-X019373Y004736D03*
-X019353Y004716D03*
+X019913Y004716D03*
+X019913Y004696D03*
+X019913Y004676D03*
+X019913Y004656D03*
 X019893Y004636D03*
 X019893Y004616D03*
 X019893Y004596D03*
@@ -2078,18 +2091,14 @@ X019893Y004556D03*
 X019873Y004536D03*
 X019873Y004516D03*
 X019873Y004496D03*
-X019913Y004656D03*
-X019913Y004676D03*
-X019913Y004696D03*
-X019913Y004716D03*
-X020073Y004636D03*
+X020053Y004496D03*
+X020053Y004516D03*
+X020053Y004536D03*
+X020073Y004556D03*
+X020073Y004576D03*
+X020073Y004596D03*
 X020073Y004616D03*
-X020073Y004596D03*
-X020073Y004576D03*
-X020073Y004556D03*
-X020053Y004536D03*
-X020053Y004516D03*
-X020053Y004496D03*
+X020073Y004636D03*
 X020093Y004656D03*
 X020093Y004676D03*
 X020093Y004696D03*
@@ -2108,19 +2117,32 @@ X020273Y004696D03*
 X020273Y004716D03*
 X020273Y004736D03*
 X020653Y004796D03*
+X018813Y004836D03*
+X018813Y004856D03*
+X018793Y004736D03*
+X018793Y004716D03*
+X018773Y004696D03*
+X018773Y004676D03*
+X018773Y004656D03*
+X018773Y004636D03*
+X018773Y004616D03*
+X018753Y004596D03*
+X018753Y004576D03*
+X018753Y004556D03*
+X018773Y004476D03*
 D21*
-X020243Y004796D03*
+X018783Y004496D03*
+X018783Y004516D03*
 X019463Y004796D03*
-X018783Y004516D03*
-X018783Y004496D03*
+X020243Y004796D03*
 D22*
+X019753Y004796D03*
+X019733Y004776D03*
+X019733Y004756D03*
+X019733Y004736D03*
+X019393Y004496D03*
 X018813Y004776D03*
 X018813Y004796D03*
-X019393Y004496D03*
-X019733Y004736D03*
-X019733Y004756D03*
-X019733Y004776D03*
-X019753Y004796D03*
 D23*
 X019403Y004536D03*
 X019403Y004516D03*
@@ -2188,4 +2210,59 @@ D35*
 X020643Y004836D03*
 X020483Y004936D03*
 X020463Y004956D03*
+D36*
+X009904Y005446D02*
+X009827Y005370D01*
+X007433Y005370D01*
+X007357Y005446D01*
+X007357Y007840D01*
+X007433Y007917D01*
+X009827Y007917D01*
+X009904Y007840D01*
+X009904Y005446D01*
+X009376Y007576D02*
+X009378Y007603D01*
+X009384Y007629D01*
+X009393Y007654D01*
+X009406Y007677D01*
+X009422Y007698D01*
+X009441Y007717D01*
+X009462Y007733D01*
+X009485Y007746D01*
+X009510Y007755D01*
+X009536Y007761D01*
+X009563Y007763D01*
+X009590Y007761D01*
+X009616Y007755D01*
+X009641Y007746D01*
+X009664Y007733D01*
+X009685Y007717D01*
+X009704Y007698D01*
+X009720Y007677D01*
+X009733Y007654D01*
+X009742Y007629D01*
+X009748Y007603D01*
+X009750Y007576D01*
+X009748Y007549D01*
+X009742Y007523D01*
+X009733Y007498D01*
+X009720Y007475D01*
+X009704Y007454D01*
+X009685Y007435D01*
+X009664Y007419D01*
+X009641Y007406D01*
+X009616Y007397D01*
+X009590Y007391D01*
+X009563Y007389D01*
+X009536Y007391D01*
+X009510Y007397D01*
+X009485Y007406D01*
+X009462Y007419D01*
+X009441Y007435D01*
+X009422Y007454D01*
+X009406Y007475D01*
+X009393Y007498D01*
+X009384Y007523D01*
+X009378Y007549D01*
+X009376Y007576D01*
 M02*
diff --git a/CAM/zoncoffee.GTP b/CAM/zoncoffee.GTP
--- a/CAM/zoncoffee.GTP
+++ b/CAM/zoncoffee.GTP
@@ -17,11 +17,12 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD17R,0.0217X0.0472*%
 %ADD18C,0.0118*%
 %ADD19R,0.0276X0.0197*%
-%ADD20R,0.0276X0.0354*%
-%ADD21R,0.0354X0.0276*%
-%ADD22C,0.0089*%
-%ADD23R,0.0492X0.0492*%
-%ADD24R,0.0276X0.0177*%
+%ADD20R,0.0433X0.0394*%
+%ADD21R,0.0276X0.0354*%
+%ADD22R,0.0354X0.0276*%
+%ADD23R,0.0276X0.0177*%
+%ADD24R,0.0197X0.0571*%
+%ADD25R,0.0571X0.0197*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1476,101 +1477,31 @@ D19*
 X017718Y008643D03*
 X017207Y008643D03*
 D20*
-X015511Y007737D03*
+X013309Y007675D03*
+X012639Y007675D03*
+D21*
+X012043Y007706D03*
+X011531Y007706D03*
 X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
-X010011Y008550D03*
-X009499Y008550D03*
+X015511Y007737D03*
+X019687Y008018D03*
+X020199Y008018D03*
+X013199Y005393D03*
+X012687Y005393D03*
+X006949Y008237D03*
+X006437Y008237D03*
 X005324Y008268D03*
 X004812Y008268D03*
 X004812Y007643D03*
 X005324Y007643D03*
 X005324Y005643D03*
 X004812Y005643D03*
-X007999Y005643D03*
-X008511Y005643D03*
-X012687Y005487D03*
-X013199Y005487D03*
-X019687Y008018D03*
-X020199Y008018D03*
-D21*
-X013880Y006868D03*
-X013880Y006356D03*
+X005999Y004893D03*
+X006511Y004893D03*
 D22*
-X011166Y006411D02*
-X011008Y006411D01*
-X011008Y006214D02*
-X011166Y006214D01*
-X011166Y006017D02*
-X011008Y006017D01*
-X010851Y005859D02*
-X010851Y005702D01*
-X010654Y005702D02*
-X010654Y005859D01*
-X010457Y005859D02*
-X010457Y005702D01*
-X010260Y005702D02*
-X010260Y005859D01*
-X010063Y005859D02*
-X010063Y005702D01*
-X009866Y005702D02*
-X009866Y005859D01*
-X009669Y005859D02*
-X009669Y005702D01*
-X009473Y005702D02*
-X009473Y005859D01*
-X009315Y006017D02*
-X009158Y006017D01*
-X009158Y006214D02*
-X009315Y006214D01*
-X009315Y006411D02*
-X009158Y006411D01*
-X009158Y006607D02*
-X009315Y006607D01*
-X009315Y006804D02*
-X009158Y006804D01*
-X009158Y007001D02*
-X009315Y007001D01*
-X009315Y007198D02*
-X009158Y007198D01*
-X009158Y007395D02*
-X009315Y007395D01*
-X009473Y007552D02*
-X009473Y007710D01*
-X009669Y007710D02*
-X009669Y007552D01*
-X009866Y007552D02*
-X009866Y007710D01*
-X010063Y007710D02*
-X010063Y007552D01*
-X010260Y007552D02*
-X010260Y007710D01*
-X010457Y007710D02*
-X010457Y007552D01*
-X010654Y007552D02*
-X010654Y007710D01*
-X010851Y007710D02*
-X010851Y007552D01*
-X011008Y007395D02*
-X011166Y007395D01*
-X011166Y007198D02*
-X011008Y007198D01*
-X011008Y007001D02*
-X011166Y007001D01*
-X011166Y006804D02*
-X011008Y006804D01*
-X011008Y006607D02*
-X011166Y006607D01*
+X013880Y006356D03*
+X013880Y006868D03*
 D23*
-X010506Y006361D03*
-X009817Y006361D03*
-X009817Y007050D03*
-X010506Y007050D03*
-D24*
-X005373Y007116D03*
 X005373Y006801D03*
 X005373Y006486D03*
 X005373Y006171D03*
@@ -1578,4 +1509,39 @@ X004763Y006171D03*
 X004763Y006486D03*
 X004763Y006801D03*
 X004763Y007116D03*
+X005373Y007116D03*
+D24*
+X007528Y008257D03*
+X007843Y008257D03*
+X008158Y008257D03*
+X008473Y008257D03*
+X008788Y008257D03*
+X009103Y008257D03*
+X009418Y008257D03*
+X009733Y008257D03*
+X009733Y005029D03*
+X009418Y005029D03*
+X009103Y005029D03*
+X008788Y005029D03*
+X008473Y005029D03*
+X008158Y005029D03*
+X007843Y005029D03*
+X007528Y005029D03*
+D25*
+X007016Y005541D03*
+X007016Y005856D03*
+X007016Y006171D03*
+X007016Y006486D03*
+X007016Y006801D03*
+X007016Y007116D03*
+X007016Y007431D03*
+X007016Y007746D03*
+X010245Y007746D03*
+X010245Y007431D03*
+X010245Y007116D03*
+X010245Y006801D03*
+X010245Y006486D03*
+X010245Y006171D03*
+X010245Y005856D03*
+X010245Y005541D03*
 M02*
diff --git a/CAM/zoncoffee.GTS b/CAM/zoncoffee.GTS
--- a/CAM/zoncoffee.GTS
+++ b/CAM/zoncoffee.GTS
@@ -22,11 +22,12 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD22C,0.0130*%
 %ADD23R,0.0640X0.0640*%
 %ADD24R,0.0316X0.0237*%
-%ADD25R,0.0316X0.0394*%
-%ADD26R,0.0394X0.0316*%
-%ADD27C,0.0138*%
-%ADD28C,0.0079*%
-%ADD29R,0.0316X0.0217*%
+%ADD25R,0.0473X0.0434*%
+%ADD26R,0.0316X0.0394*%
+%ADD27R,0.0394X0.0316*%
+%ADD28R,0.0316X0.0217*%
+%ADD29R,0.0237X0.0611*%
+%ADD30R,0.0611X0.0237*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1522,164 +1523,37 @@ X013818Y008393D03*
 X012818Y008393D03*
 X011693Y008393D03*
 X010693Y008393D03*
-X009943Y004831D03*
-X008943Y004831D03*
+X010349Y004800D03*
+X011349Y004800D03*
 D24*
 X017207Y008643D03*
 X017718Y008643D03*
 D25*
+X013309Y007675D03*
+X012639Y007675D03*
+D26*
+X012043Y007706D03*
+X011531Y007706D03*
+X014999Y007737D03*
+X015511Y007737D03*
 X019687Y008018D03*
 X020199Y008018D03*
-X015511Y007737D03*
-X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
-X010011Y008550D03*
-X009499Y008550D03*
+X013199Y005393D03*
+X012687Y005393D03*
+X006949Y008237D03*
+X006437Y008237D03*
 X005324Y008268D03*
 X004812Y008268D03*
 X004812Y007643D03*
 X005324Y007643D03*
 X005324Y005643D03*
 X004812Y005643D03*
-X007999Y005643D03*
-X008511Y005643D03*
-X012687Y005487D03*
-X013199Y005487D03*
-D26*
+X005999Y004893D03*
+X006511Y004893D03*
+D27*
 X013880Y006356D03*
 X013880Y006868D03*
-D27*
-X011166Y006804D02*
-X011008Y006804D01*
-X011008Y006607D02*
-X011166Y006607D01*
-X011166Y006411D02*
-X011008Y006411D01*
-X011008Y006214D02*
-X011166Y006214D01*
-X011166Y006017D02*
-X011008Y006017D01*
-X010851Y005859D02*
-X010851Y005702D01*
-X010654Y005702D02*
-X010654Y005859D01*
-X010457Y005859D02*
-X010457Y005702D01*
-X010260Y005702D02*
-X010260Y005859D01*
-X010063Y005859D02*
-X010063Y005702D01*
-X009866Y005702D02*
-X009866Y005859D01*
-X009669Y005859D02*
-X009669Y005702D01*
-X009473Y005702D02*
-X009473Y005859D01*
-X009315Y006017D02*
-X009158Y006017D01*
-X009158Y006214D02*
-X009315Y006214D01*
-X009315Y006411D02*
-X009158Y006411D01*
-X009158Y006607D02*
-X009315Y006607D01*
-X009315Y006804D02*
-X009158Y006804D01*
-X009158Y007001D02*
-X009315Y007001D01*
-X009315Y007198D02*
-X009158Y007198D01*
-X009158Y007395D02*
-X009315Y007395D01*
-X009473Y007552D02*
-X009473Y007710D01*
-X009669Y007710D02*
-X009669Y007552D01*
-X009866Y007552D02*
-X009866Y007710D01*
-X010063Y007710D02*
-X010063Y007552D01*
-X010260Y007552D02*
-X010260Y007710D01*
-X010457Y007710D02*
-X010457Y007552D01*
-X010654Y007552D02*
-X010654Y007710D01*
-X010851Y007710D02*
-X010851Y007552D01*
-X011008Y007395D02*
-X011166Y007395D01*
-X011166Y007198D02*
-X011008Y007198D01*
-X011008Y007001D02*
-X011166Y007001D01*
 D28*
-X010851Y006987D02*
-X009473Y006987D01*
-X009473Y006910D02*
-X010851Y006910D01*
-X010851Y006833D02*
-X009473Y006833D01*
-X009473Y006755D02*
-X010851Y006755D01*
-X010851Y006678D02*
-X009473Y006678D01*
-X009473Y006601D02*
-X010851Y006601D01*
-X010851Y006524D02*
-X009473Y006524D01*
-X009473Y006446D02*
-X010851Y006446D01*
-X010851Y006369D02*
-X009473Y006369D01*
-X009473Y006292D02*
-X010851Y006292D01*
-X010851Y006215D02*
-X009473Y006215D01*
-X009473Y006137D02*
-X010851Y006137D01*
-X010851Y006115D02*
-X010847Y006090D01*
-X010837Y006066D01*
-X010822Y006046D01*
-X010801Y006030D01*
-X010778Y006020D01*
-X010752Y006017D01*
-X009571Y006017D01*
-X009546Y006020D01*
-X009522Y006030D01*
-X009501Y006046D01*
-X009486Y006066D01*
-X009476Y006090D01*
-X009473Y006115D01*
-X009473Y007296D01*
-X010752Y007296D01*
-X010675Y007373D02*
-X009511Y007373D01*
-X009501Y007366D02*
-X009522Y007382D01*
-X009546Y007391D01*
-X009571Y007395D01*
-X010654Y007395D01*
-X010851Y007198D01*
-X010851Y006115D01*
-X010833Y006060D02*
-X009490Y006060D01*
-X009473Y007064D02*
-X010851Y007064D01*
-X010851Y007142D02*
-X009473Y007142D01*
-X009473Y007219D02*
-X010830Y007219D01*
-X009501Y007366D02*
-X009486Y007346D01*
-X009476Y007322D01*
-X009473Y007296D01*
-D29*
-X005373Y007116D03*
 X005373Y006801D03*
 X005373Y006486D03*
 X005373Y006171D03*
@@ -1687,4 +1561,39 @@ X004763Y006171D03*
 X004763Y006486D03*
 X004763Y006801D03*
 X004763Y007116D03*
+X005373Y007116D03*
+D29*
+X007528Y008257D03*
+X007843Y008257D03*
+X008158Y008257D03*
+X008473Y008257D03*
+X008788Y008257D03*
+X009103Y008257D03*
+X009418Y008257D03*
+X009733Y008257D03*
+X009733Y005029D03*
+X009418Y005029D03*
+X009103Y005029D03*
+X008788Y005029D03*
+X008473Y005029D03*
+X008158Y005029D03*
+X007843Y005029D03*
+X007528Y005029D03*
+D30*
+X007016Y005541D03*
+X007016Y005856D03*
+X007016Y006171D03*
+X007016Y006486D03*
+X007016Y006801D03*
+X007016Y007116D03*
+X007016Y007431D03*
+X007016Y007746D03*
+X010245Y007746D03*
+X010245Y007431D03*
+X010245Y007116D03*
+X010245Y006801D03*
+X010245Y006486D03*
+X010245Y006171D03*
+X010245Y005856D03*
+X010245Y005541D03*
 M02*
diff --git a/CAM/zoncoffee.TXT b/CAM/zoncoffee.TXT
--- a/CAM/zoncoffee.TXT
+++ b/CAM/zoncoffee.TXT
@@ -9,95 +9,97 @@ T05C0.0413
 T06C0.1000
 %
 T01
+X5380Y4893
 X4787Y5268
 X6005Y5456
+X6162Y5737
 X5693Y5956
+X6193Y6143
 X5818Y6456
-X6474Y6581
-X6255Y6831
-X5943Y7331
-X6193Y7643
-X6193Y7956
-X6193Y8268
-X6568Y8362
-X8912Y8018
-X9693Y7956
-X9068Y8550
-X11380Y7487
-X11568Y7237
-X11849Y6987
-X11662Y6737
-X12037Y6487
-X11880Y6206
-X11537Y5987
-X10162Y6706
-X8849Y6675
-X8693Y6956
-X8443Y6081
-X7005Y6081
-X6818Y5831
-X7005Y5550
-X6693Y6206
-X8443Y5237
-X10505Y4737
-X11412Y5113
-X11912Y5112
-X12412Y5112
-X12912Y5112
-X13943Y5425
-X14193Y5143
-X14505Y5956
+X6099Y6612
+X5755Y6831
+X5693Y7331
+X5693Y7643
+X5693Y7956
+X5693Y8268
+X6005Y8393
+X6443Y8643
+X8474Y7800
+X9162Y7675
+X9724Y7737
+X9693Y7393
+X9162Y6893
+X8755Y7143
+X8380Y6643
+X8630Y6300
+X9099Y6018
+X9412Y6143
+X9724Y6268
+X8787Y5737
+X8474Y5518
+X11130Y5393
+X12224Y6175
+X11974Y6425
+X11755Y6675
+X11505Y6925
+X11318Y7206
+X11099Y7456
+X13943Y7768
+X14474Y7925
+X16693Y8643
+X18193Y8643
+X18318Y7550
+X18693Y7081
+X19130Y6800
+X19568Y6262
+X19818Y6018
+X20630Y5081
+X21130Y5112
+X18068Y5706
+X17662Y6112
+X17255Y6487
+X16005Y6300
+X15505Y6300
 X15005Y6300
-X15505Y6300
-X16005Y6300
-X17255Y6487
-X17662Y6112
-X18068Y5706
-X19130Y6800
-X18755Y7143
-X18318Y7550
-X19818Y6637
-X20068Y6393
-X20130Y7143
+X14474Y6112
+X13724Y5768
+X14193Y5675
+X14005Y5362
+X12662Y5020
+X20130Y7518
 X20662Y7956
 X20755Y8362
 X21130Y8419
 X21912Y8393
-X18193Y8643
-X16693Y8643
-X13755Y7831
-X13443Y7768
-X20630Y5081
-X21130Y5112
 T02
+X21818Y8893
+X22068Y8893
+X21568Y8893
+X21318Y8893
+X21068Y8893
+X20818Y8893
+X20568Y8893
+X20568Y4393
+X20818Y4393
 X21068Y4393
 X21318Y4393
 X21568Y4393
 X21818Y4393
 X22068Y4393
-X20818Y4393
-X20568Y4393
-X20568Y8893
-X20818Y8893
-X21068Y8893
-X21318Y8893
-X21568Y8893
-X21818Y8893
-X22068Y8893
-X6068Y8893
-X5818Y8893
+X6068Y4393
+X5818Y4393
+X5568Y4393
+X5318Y4393
+X5068Y4393
+X4818Y4393
+X4568Y4393
+X4568Y8893
+X4818Y8893
+X5068Y8893
+X5318Y8893
 X5568Y8893
-X5318Y8893
-X5068Y8893
-X4818Y8893
-X4568Y8893
-X4568Y4393
-X4818Y4393
-X5068Y4393
-X5318Y4393
-X5568Y4393
-X5818Y4393
-X6068Y4393
+X5818Y8893
+X6068Y8893
 T03
 X17664Y7172
 T04
@@ -107,8 +109,8 @@ X13818Y8393
 X12818Y8393
 X11693Y8393
 X10693Y8393
-X9943Y4831
-X8943Y4831
+X10349Y4800
+X11349Y4800
 T05
 X18722Y6114
 T06
diff --git a/CAM/zoncoffee.dri b/CAM/zoncoffee.dri
--- a/CAM/zoncoffee.dri
+++ b/CAM/zoncoffee.dri
@@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0
 
 Drill Station Info File: /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.dri
 
- Date              : 19 Nov 2014 22:49:22
+ Date              : 20 Dec 2014 20:17:39
  Drills            : generated
  Device            : Excellon drill station
 
@@ -27,14 +27,14 @@ Drills used:
 
  Code  Size       used
 
- T01   0.0120inch    60
+ T01   0.0120inch    62
  T02   0.0150inch    28
  T03   0.0295inch     1
  T04   0.0400inch     8
  T05   0.0413inch     1
  T06   0.1000inch     4
 
-Total number of drills: 102
+Total number of drills: 104
 
 Plotfiles:
 
diff --git a/CAM/zoncoffee.gpi b/CAM/zoncoffee.gpi
--- a/CAM/zoncoffee.gpi
+++ b/CAM/zoncoffee.gpi
@@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0
 
 Photoplotter Info File: /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.gpi
 
- Date              : 19 Nov 2014 22:49:23
+ Date              : 20 Dec 2014 20:17:40
  Plotfile          : /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.GTL
  Apertures         : generated: 
  Device            : Gerber RS-274-X photoplotter, coordinate format 2.4 inch
@@ -41,13 +41,15 @@ Apertures used:
  D15      square    0.0748inch               2
  D16      rectangle 0.0236inch x 0.0610inch     8
  D17      rectangle 0.0217inch x 0.0472inch     5
- D18      draw      0.0118inch              34
+ D18      draw      0.0118inch               2
  D19      square    0.0600inch               8
  D20      rectangle 0.0276inch x 0.0197inch     2
- D21      rectangle 0.0276inch x 0.0354inch    20
- D22      rectangle 0.0354inch x 0.0276inch     2
- D23      draw      0.0138inch               1
+ D21      rectangle 0.0433inch x 0.0394inch     2
+ D22      rectangle 0.0276inch x 0.0354inch    18
+ D23      rectangle 0.0354inch x 0.0276inch     2
  D24      rectangle 0.0276inch x 0.0177inch     8
- D25      round     0.0240inch              60
- D26      draw      0.0080inch             234
+ D25      rectangle 0.0197inch x 0.0571inch    16
+ D26      rectangle 0.0571inch x 0.0197inch    16
+ D27      round     0.0240inch              62
+ D28      draw      0.0080inch             239
 
diff --git a/archive/eagle.epf b/archive/eagle.epf
--- a/archive/eagle.epf
+++ b/archive/eagle.epf
@@ -393,9 +393,9 @@ UsedLibrary="/home/ethanzonca/Projects/Z
 Type="Schematic Editor"
 Loc="640 0 1265 724"
 State=2
-Number=3
+Number=5
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.sch"
-View="-4.83332 -2.7758 296.939 192.006"
+View="3.0389 41.5682 295.56 236.35"
 WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.1524"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
@@ -434,23 +434,31 @@ ArcDirection=0
 AddLevel=2
 PadsSameType=0
 Layer=91
-Views=" 1: -4.83332 -2.7758 296.939 192.006"
+Views=" 1: 3.0389 41.5682 295.56 236.35"
 Sheet=1
 
 [Win_2]
-Type="Library Editor"
-Loc="0 0 599 399"
+Type="CAM Processor"
+Loc="0 0 599 448"
+State=2
+Number=1
+File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
+Job="/home/ethanzonca/Projects/protofusion-hardware/cam/Elecrow_Gerber_Generater_DrillAlign.cam"
+
+[Win_3]
+Type="Board Editor"
+Loc="0 0 625 724"
 State=3
-Number=4
-File="/home/ethanzonca/Projects/protofusion-hardware/lbr/Protofusion.lbr"
-View="-2.86221 -0.2661 6.26716 2.01625"
-WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.127"
+Number=2
+File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
+View="-0.503897 2.30053 45.5012 15.5041"
+WireWidths=" 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0 0.2032"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
+PadDrills=" 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8 0.3048"
 ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-TextSizes=" 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.27 0.1016"
+ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
+HoleDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.016 0.8128 1.27"
 PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
 PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
@@ -459,14 +467,14 @@ DimensionExtWidths=" 0.127 0.254 0.1 0.1
 DimensionExtLengths=" 1.27 2.54 1 2 3 0"
 DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
 SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=0
+WireBend=1
 WireBendSet=0
 WireCap=1
-MiterStyle=0
+MiterStyle=1
 PadShape=0
-ViaShape=0
+ViaShape=1
 PolygonPour=0
-PolygonRank=0
+PolygonRank=1
 PolygonThermals=1
 PolygonOrphans=0
 TextRatio=8
@@ -481,64 +489,9 @@ SwapLevel=0
 ArcDirection=0
 AddLevel=2
 PadsSameType=0
-Layer=21
-Package="THERM_LOGO_SMALL_0.2"
-
-[Win_3]
-Type="Board Editor"
-Loc="0 0 625 724"
-State=1
-Number=2
-File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-View="-12.2014 -7.72682 48.6686 25.1277"
-WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.2032"
-PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8 0.3048"
-ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
-HoleDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.016 0.8128 1.27"
-PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
-PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
-DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13"
-DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0"
-DimensionExtLengths=" 1.27 2.54 1 2 3 0"
-DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
-SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=2
-WireBendSet=0
-WireCap=1
-MiterStyle=1
-PadShape=0
-ViaShape=1
-PolygonPour=0
-PolygonRank=1
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-DimensionUnit=3
-DimensionPrecision=2
-DimensionShowUnit=0
-PinDirection=3
-PinFunction=0
-PinLength=2
-PinVisible=3
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=209
+Layer=1
 
 [Win_4]
-Type="CAM Processor"
-Loc="0 0 599 448"
-State=2
-Number=5
-File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-Job="/home/ethanzonca/Projects/protofusion-hardware/cam/Elecrow_Gerber_Generater_DrillAlign.cam"
-
-[Win_5]
 Type="Control Panel"
 Loc="585 230 1184 629"
 State=2
@@ -550,4 +503,3 @@ Window="Win_1"
 Window="Win_2"
 Window="Win_3"
 Window="Win_4"
-Window="Win_5"
diff --git a/therm-logo.svg b/therm-logo.svg
--- a/therm-logo.svg
+++ b/therm-logo.svg
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7415097"
-     inkscape:cx="38.192349"
-     inkscape:cy="18.672223"
+     inkscape:zoom="5.474074"
+     inkscape:cx="61.46279"
+     inkscape:cy="47.034892"
      inkscape:document-units="in"
      inkscape:current-layer="g3035"
      showgrid="false"
@@ -109,6 +109,35 @@
                id="tspan3009-7"
                sodipodi:role="line">0.2</tspan></text>
         </g>
+        <g
+           id="g3027"
+           transform="matrix(0.3948502,0,0,0.3948502,56.653369,611.95843)"
+           inkscape:export-filename="/home/ethanzonca/Projects/ZonCoffeeOLED/therm-0.2-small.png.png"
+           inkscape:export-xdpi="500"
+           inkscape:export-ydpi="500">
+          <text
+             xml:space="preserve"
+             style="font-size:15.75990486px;font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Delicious Heavy;-inkscape-font-specification:'Delicious Heavy, Oblique'"
+             x="96.163521"
+             y="995.5246"
+             id="text3003-96"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3005-9"
+               x="96.163521"
+               y="995.5246">therm</tspan></text>
+          <text
+             xml:space="preserve"
+             style="font-size:6.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Delicious SmallCaps;-inkscape-font-specification:'Delicious SmallCaps,'"
+             x="135.46036"
+             y="988.49286"
+             id="text3007-1-8"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3009-7-64"
+               x="135.46036"
+               y="988.49286">0.2</tspan></text>
+        </g>
       </g>
       <g
          id="g3026"
diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="6.5.0">
+<eagle version="7.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="3.125" altunitdist="mil" altunit="mil"/>
+<grid distance="12.5" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="3.125" altunitdist="mil" altunit="mil"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -37,7 +37,7 @@
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
-<layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
+<layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
 <layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
@@ -64,6 +64,8 @@
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
 <layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
+<layer number="90" name="Modules" color="7" fill="1" visible="no" active="no"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="no" active="no"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="no" active="no"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="no"/>
@@ -199,9 +201,9 @@
 <dimension x1="1.27" y1="0" x2="45.72" y2="19.05" x3="-8.89" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="45.72" y1="3.81" x2="45.72" y2="15.24" x3="-5.715" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="0" y1="19.685" x2="45.085" y2="19.685" x3="22.5425" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
-<text x="13.096875" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
-<text x="10.95375" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
-<text x="13.0175" y="3.96875" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
+<text x="16.66875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
+<text x="14.366875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
+<text x="24.209375" y="0.3175" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
 <text x="0.396875" y="6.270625" size="0.8128" layer="22" ratio="16" rot="SMR90">Zonca 2014</text>
 <circle x="29.36875" y="11.90625" radius="0.127" width="0.2032" layer="21"/>
 <circle x="31.75" y="14.605" radius="0.127" width="0.2032" layer="21"/>
@@ -243,6 +245,8 @@
 <hole x="0.9525" y="15.24" drill="0.381"/>
 <hole x="0.3175" y="15.24" drill="0.381"/>
 <hole x="2.2225" y="15.24" drill="0.381"/>
+<circle x="14.12875" y="14.44625" radius="0.127" width="0.2032" layer="21"/>
+<text x="20.32" y="-3.175" size="1.778" layer="1">progconn orientation?</text>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -256,10 +260,10 @@
 <wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="51"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
 <smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
@@ -275,8 +279,25 @@
 <smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
+<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
 <text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
 <text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
+<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
+<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
+<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
+<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
+<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
+<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
+<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
+<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
+<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
+<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
+<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
+<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
+<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
+<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
+<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
 </package>
 </packages>
 </library>
@@ -1902,125 +1923,6 @@ You are welcome to use this library for 
 <rectangle x1="11.2522" y1="6.5786" x2="11.3538" y2="6.6294" layer="21"/>
 <rectangle x1="12.4714" y1="6.5786" x2="12.7254" y2="6.6294" layer="21"/>
 </package>
-<package name="UFQFPN32">
-<wire x1="-2.4" y1="2.4" x2="2.4" y2="2.4" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="2.4" x2="2.4" y2="-2.4" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="-2.4" x2="-2.4" y2="-2.4" width="0.2032" layer="51"/>
-<wire x1="-2.4" y1="-2.4" x2="-2.4" y2="2.4" width="0.2032" layer="51"/>
-<wire x1="-2.55" y1="1.75" x2="-2.15" y2="1.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="1.75" x2="-2.15" y2="1.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="1.25" x2="-2.15" y2="1.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="1.25" x2="-2.15" y2="1.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="0.75" x2="-2.15" y2="0.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="0.75" x2="-2.15" y2="0.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="0.25" x2="-2.15" y2="0.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="0.25" x2="-2.15" y2="0.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-0.25" x2="-2.15" y2="-0.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-0.25" x2="-2.15" y2="-0.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-0.75" x2="-2.15" y2="-0.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-0.75" x2="-2.15" y2="-0.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-1.25" x2="-2.15" y2="-1.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-1.25" x2="-2.15" y2="-1.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-1.75" x2="-2.15" y2="-1.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-1.75" x2="-2.15" y2="-1.75" width="0.225" layer="31"/>
-<wire x1="-1.75" y1="-2.55" x2="-1.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-1.75" y1="-2.55" x2="-1.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-1.25" y1="-2.55" x2="-1.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-1.25" y1="-2.55" x2="-1.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-0.75" y1="-2.55" x2="-0.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-0.75" y1="-2.55" x2="-0.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-0.25" y1="-2.55" x2="-0.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-0.25" y1="-2.55" x2="-0.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="0.25" y1="-2.55" x2="0.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="0.25" y1="-2.55" x2="0.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="0.75" y1="-2.55" x2="0.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="0.75" y1="-2.55" x2="0.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="1.25" y1="-2.55" x2="1.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="1.25" y1="-2.55" x2="1.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="1.75" y1="-2.55" x2="1.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="1.75" y1="-2.55" x2="1.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-1.75" x2="2.15" y2="-1.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-1.75" x2="2.15" y2="-1.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-1.25" x2="2.15" y2="-1.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-1.25" x2="2.15" y2="-1.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-0.75" x2="2.15" y2="-0.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-0.75" x2="2.15" y2="-0.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-0.25" x2="2.15" y2="-0.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-0.25" x2="2.15" y2="-0.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="0.25" x2="2.15" y2="0.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="0.25" x2="2.15" y2="0.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="0.75" x2="2.15" y2="0.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="0.75" x2="2.15" y2="0.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="1.25" x2="2.15" y2="1.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="1.25" x2="2.15" y2="1.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="1.75" x2="2.15" y2="1.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="1.75" x2="2.15" y2="1.75" width="0.225" layer="31"/>
-<wire x1="1.75" y1="2.55" x2="1.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="1.75" y1="2.55" x2="1.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="1.25" y1="2.55" x2="1.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="1.25" y1="2.55" x2="1.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="0.75" y1="2.55" x2="0.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="0.75" y1="2.55" x2="0.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="0.25" y1="2.55" x2="0.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="0.25" y1="2.55" x2="0.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-0.25" y1="2.55" x2="-0.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-0.25" y1="2.55" x2="-0.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-0.75" y1="2.55" x2="-0.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-0.75" y1="2.55" x2="-0.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-1.25" y1="2.55" x2="-1.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-1.25" y1="2.55" x2="-1.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-1.75" y1="2.55" x2="-1.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-1.75" y1="2.55" x2="-1.75" y2="2.15" width="0.225" layer="31"/>
-<smd name="1" x="-2.35" y="1.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="2" x="-2.35" y="1.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="3" x="-2.35" y="0.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="4" x="-2.35" y="0.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="5" x="-2.35" y="-0.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="6" x="-2.35" y="-0.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="7" x="-2.35" y="-1.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="8" x="-2.35" y="-1.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="9" x="-1.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="10" x="-1.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="11" x="-0.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="12" x="-0.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="13" x="0.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="14" x="0.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="15" x="1.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="16" x="1.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="17" x="2.35" y="-1.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="18" x="2.35" y="-1.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="19" x="2.35" y="-0.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="20" x="2.35" y="-0.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="21" x="2.35" y="0.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="22" x="2.35" y="0.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="23" x="2.35" y="1.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="24" x="2.35" y="1.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="25" x="1.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="26" x="1.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="27" x="0.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="28" x="0.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="29" x="-0.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="30" x="-0.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="31" x="-1.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="32" x="-1.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="EXP" x="0" y="0" dx="3.5" dy="3.5" layer="1" roundness="10" stop="no" cream="no"/>
-<rectangle x1="-2.45" y1="2" x2="-2" y2="2.45" layer="21"/>
-<rectangle x1="-2.45" y1="0" x2="0" y2="2.45" layer="51"/>
-<rectangle x1="-1.5" y1="0.25" x2="-0.25" y2="1.5" layer="31"/>
-<rectangle x1="0.25" y1="0.25" x2="1.5" y2="1.5" layer="31"/>
-<rectangle x1="0.25" y1="-1.5" x2="1.5" y2="-0.25" layer="31"/>
-<rectangle x1="-1.5" y1="-1.5" x2="-0.25" y2="-0.25" layer="31"/>
-<polygon width="0.2" layer="29">
-<vertex x="-1.75" y="1.25"/>
-<vertex x="-1.25" y="1.75"/>
-<vertex x="1.5" y="1.75" curve="-90"/>
-<vertex x="1.75" y="1.5"/>
-<vertex x="1.75" y="-1.5" curve="-90"/>
-<vertex x="1.5" y="-1.75"/>
-<vertex x="-1.5" y="-1.75" curve="-90"/>
-<vertex x="-1.75" y="-1.5"/>
-</polygon>
-</package>
 <package name="1206-ARV-4">
 <wire x1="-1.55" y1="0.75" x2="-1.35" y2="0.75" width="0.1016" layer="51"/>
 <wire x1="-1.05" y1="0.75" x2="-0.55" y2="0.75" width="0.1016" layer="51"/>
@@ -2061,26 +1963,6 @@ You are welcome to use this library for 
 <text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
-<package name="POGOPROG-CONN-ALLSMT">
-<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
-<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="1.905"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="-0.635" y="3.175"/>
-</polygon>
-<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-</package>
 <package name="THERM_LOGO_SMALL_0.2">
 <rectangle x1="0.0762" y1="0.0254" x2="0.3302" y2="0.0762" layer="21"/>
 <rectangle x1="1.651" y1="0.0254" x2="1.905" y2="0.0762" layer="21"/>
@@ -2252,6 +2134,119 @@ You are welcome to use this library for 
 <rectangle x1="4.445" y1="1.2446" x2="4.5466" y2="1.2954" layer="21"/>
 <rectangle x1="4.9022" y1="1.2446" x2="5.0546" y2="1.2954" layer="21"/>
 </package>
+<package name="LQFP32">
+<wire x1="-3.5" y1="3.15" x2="-3.5" y2="-3.15" width="0.1524" layer="51"/>
+<wire x1="-3.5" y1="-3.15" x2="-3.15" y2="-3.5" width="0.1524" layer="51"/>
+<wire x1="-3.15" y1="-3.5" x2="3.15" y2="-3.5" width="0.1524" layer="51"/>
+<wire x1="3.15" y1="-3.5" x2="3.5" y2="-3.15" width="0.1524" layer="51"/>
+<wire x1="3.5" y1="-3.15" x2="3.5" y2="3.15" width="0.1524" layer="51"/>
+<wire x1="3.5" y1="3.15" x2="3.15" y2="3.5" width="0.1524" layer="51"/>
+<wire x1="3.15" y1="3.5" x2="-3.15" y2="3.5" width="0.1524" layer="51"/>
+<wire x1="-3.15" y1="3.5" x2="-3.5" y2="3.15" width="0.1524" layer="51"/>
+<wire x1="-3.35" y1="3.088" x2="-3.35" y2="-3.088" width="0.0762" layer="51"/>
+<wire x1="-3.35" y1="-3.088" x2="-3.088" y2="-3.35" width="0.0762" layer="51"/>
+<wire x1="-3.088" y1="-3.35" x2="3.088" y2="-3.35" width="0.0762" layer="51"/>
+<wire x1="3.088" y1="-3.35" x2="3.35" y2="-3.088" width="0.0762" layer="51"/>
+<wire x1="3.35" y1="-3.088" x2="3.35" y2="3.088" width="0.0762" layer="51"/>
+<wire x1="3.35" y1="3.088" x2="3.088" y2="3.35" width="0.0762" layer="51"/>
+<wire x1="3.088" y1="3.35" x2="-3.088" y2="3.35" width="0.0762" layer="51"/>
+<wire x1="-3.088" y1="3.35" x2="-3.35" y2="3.088" width="0.0762" layer="51"/>
+<wire x1="-3.235" y1="3.04" x2="-3.235" y2="-3.04" width="0.1524" layer="21"/>
+<wire x1="-3.235" y1="-3.04" x2="-3.04" y2="-3.235" width="0.1524" layer="21"/>
+<wire x1="-3.04" y1="-3.235" x2="3.04" y2="-3.235" width="0.1524" layer="21"/>
+<wire x1="3.04" y1="-3.235" x2="3.235" y2="-3.04" width="0.1524" layer="21"/>
+<wire x1="3.235" y1="-3.04" x2="3.235" y2="3.04" width="0.1524" layer="21"/>
+<wire x1="3.235" y1="3.04" x2="3.04" y2="3.235" width="0.1524" layer="21"/>
+<wire x1="3.04" y1="3.235" x2="-3.04" y2="3.235" width="0.1524" layer="21"/>
+<wire x1="-3.04" y1="3.235" x2="-3.235" y2="3.04" width="0.1524" layer="21"/>
+<circle x="-2.37" y="2.37" radius="0.475" width="0.1524" layer="21"/>
+<smd name="1" x="-4.1" y="2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="2" x="-4.1" y="2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="3" x="-4.1" y="1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="4" x="-4.1" y="0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="5" x="-4.1" y="-0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="6" x="-4.1" y="-1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="7" x="-4.1" y="-2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="8" x="-4.1" y="-2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="9" x="-2.8" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="10" x="-2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="11" x="-1.2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="12" x="-0.4" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="13" x="0.4" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="14" x="1.2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="15" x="2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="16" x="2.8" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="17" x="4.1" y="-2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="18" x="4.1" y="-2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="19" x="4.1" y="-1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="20" x="4.1" y="-0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="21" x="4.1" y="0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="22" x="4.1" y="1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="23" x="4.1" y="2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="24" x="4.1" y="2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="25" x="2.8" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="26" x="2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="27" x="1.2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="28" x="0.4" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="29" x="-0.4" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="30" x="-1.2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="31" x="-2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="32" x="-2.8" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<text x="-3" y="5" size="1.27" layer="21" ratio="10">&gt;NAME</text>
+<rectangle x1="-4.185" y1="2.3" x2="-3.815" y2="3.3" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="1.5" x2="-3.815" y2="2.5" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-3.3" x2="-3.815" y2="-2.3" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-2.5" x2="-3.815" y2="-1.5" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-1.7" x2="-3.815" y2="-0.7" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-0.9" x2="-3.815" y2="0.1" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-0.1" x2="-3.815" y2="0.9" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="0.7" x2="-3.815" y2="1.7" layer="51" rot="R270"/>
+<rectangle x1="-2.985" y1="-4.5" x2="-2.615" y2="-3.5" layer="51"/>
+<rectangle x1="-2.185" y1="-4.5" x2="-1.815" y2="-3.5" layer="51"/>
+<rectangle x1="2.615" y1="-4.5" x2="2.985" y2="-3.5" layer="51"/>
+<rectangle x1="1.815" y1="-4.5" x2="2.185" y2="-3.5" layer="51"/>
+<rectangle x1="1.015" y1="-4.5" x2="1.385" y2="-3.5" layer="51"/>
+<rectangle x1="0.215" y1="-4.5" x2="0.585" y2="-3.5" layer="51"/>
+<rectangle x1="-0.585" y1="-4.5" x2="-0.215" y2="-3.5" layer="51"/>
+<rectangle x1="-1.385" y1="-4.5" x2="-1.015" y2="-3.5" layer="51"/>
+<rectangle x1="3.815" y1="-3.3" x2="4.185" y2="-2.3" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-2.5" x2="4.185" y2="-1.5" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="2.3" x2="4.185" y2="3.3" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="1.5" x2="4.185" y2="2.5" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="0.7" x2="4.185" y2="1.7" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-0.1" x2="4.185" y2="0.9" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-0.9" x2="4.185" y2="0.1" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-1.7" x2="4.185" y2="-0.7" layer="51" rot="R90"/>
+<rectangle x1="2.615" y1="3.5" x2="2.985" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="1.815" y1="3.5" x2="2.185" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-2.985" y1="3.5" x2="-2.615" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-2.185" y1="3.5" x2="-1.815" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-1.385" y1="3.5" x2="-1.015" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-0.585" y1="3.5" x2="-0.215" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="0.215" y1="3.5" x2="0.585" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="1.015" y1="3.5" x2="1.385" y2="4.5" layer="51" rot="R180"/>
+</package>
+<package name="POGOPROG-CONN-4-ALLSMT">
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
+<wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="1.905" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="0.635"/>
+<vertex x="0.635" y="0.635"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="-0.635" y="1.905"/>
+</polygon>
+<text x="-2.54" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="0" y1="3.81" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0.3175" y1="2.8575" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0" y1="2.54" x2="-0.3175" y2="2.8575" width="0.127" layer="21"/>
+</package>
 </packages>
 </library>
 <library name="SparkFun-DiscreteSemi">
@@ -2306,6 +2301,22 @@ chip</description>
 <rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
 <rectangle x1="-0.2032" y1="-0.3556" x2="0.2032" y2="0.3556" layer="21"/>
 </package>
+<package name="0603-CAP">
+<wire x1="-1.473" y1="0.983" x2="1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="0.983" x2="1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="-0.983" x2="-1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-1.473" y1="-0.983" x2="-1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="-0.356" y1="0.432" x2="0.356" y2="0.432" width="0.1016" layer="51"/>
+<wire x1="-0.356" y1="-0.419" x2="0.356" y2="-0.419" width="0.1016" layer="51"/>
+<wire x1="0" y1="0.0305" x2="0" y2="-0.0305" width="0.5588" layer="21"/>
+<smd name="1" x="-0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<smd name="2" x="0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<text x="-0.889" y="0.762" size="0.4064" layer="25" font="vector">&gt;NAME</text>
+<text x="-1.016" y="-1.143" size="0.4064" layer="27" font="vector">&gt;VALUE</text>
+<rectangle x1="-0.8382" y1="-0.4699" x2="-0.3381" y2="0.4801" layer="51"/>
+<rectangle x1="0.3302" y1="-0.4699" x2="0.8303" y2="0.4801" layer="51"/>
+<rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
+</package>
 <package name="0402-CAP">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;&lt;p&gt;
 chip</description>
@@ -2423,6 +2434,9 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="12.5mil"/>
+<param name="AutoGrid" value="1"/>
+<param name="Efforts" value="0"/>
+<param name="TopRouterVariant" value="1"/>
 <param name="tpViaShape" value="round"/>
 <param name="PrefDir.1" value="|"/>
 <param name="PrefDir.2" value="0"/>
@@ -2517,15 +2531,15 @@ design rules under a new name.</descript
 <element name="SW1" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="9.525" smashed="yes" rot="R45">
 <attribute name="NAME" x="35.44119375" y="12.29685625" size="0.8128" layer="25" ratio="16" rot="R315"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="9.525" smashed="yes" rot="R90">
+<element name="JP1" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="9.525" smashed="yes" rot="R90">
 <attribute name="PROD_ID" value="CONN-09505" x="78.105" y="37.465" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="NAME" x="44.165" y="8.956875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="46.99" y="7.62" size="0.762" layer="27" rot="R90"/>
 </element>
-<element name="U3" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
+<element name="IC1" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
 <attribute name="NAME" x="31.035625" y="6.19125" size="0.8128" layer="25" font="vector" ratio="16" rot="R90"/>
 </element>
-<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="9.2075" smashed="yes" rot="R180">
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2210K-3.3" x="21.59" y="9.2075" smashed="yes" rot="R180">
 <attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="42.2275" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="20.066" y="7.20725" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="22.5425" y="9.398" size="0.4064" layer="27" rot="R180"/>
@@ -2541,62 +2555,64 @@ design rules under a new name.</descript
 <attribute name="NAME" x="35.537775" y="14.290675" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="32.3342" y="13.6144" size="0.4064" layer="27"/>
 </element>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="12.3825" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.08225" y="12.557125" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="22.51075" y="13.5255" size="0.4064" layer="27" rot="R180"/>
+<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="21.669375" y="12.144375" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.320375" y="12.319" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="22.748875" y="13.287375" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.588125" smashed="yes" rot="R180">
-<attribute name="NAME" x="20.939125" y="8.66775" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="22.6695" y="7.731125" size="0.4064" layer="27" rot="R180"/>
+<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.35" smashed="yes">
+<attribute name="NAME" x="22.240875" y="4.270375" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="20.5105" y="5.207" size="0.4064" layer="27"/>
 </element>
 <element name="R1" library="SparkFun-Passives" package="0402-RES" value="" x="39.37" y="13.0175" smashed="yes" rot="R180">
 <attribute name="NAME" x="40.894" y="12.319" size="0.8128" layer="25" ratio="16" rot="R180"/>
 <attribute name="VALUE" x="40.4495" y="14.1605" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="23.97125" y="9.445625" smashed="yes" rot="R90">
+<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="23.97125" y="9.445625" smashed="yes" rot="R90">
 <attribute name="NAME" x="23.5585" y="12.080875" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="25.11425" y="8.366125" size="0.4064" layer="27" rot="R90"/>
 </element>
-<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.36625" smashed="yes" rot="R180">
-<attribute name="VALUE" x="30.635" y="16.86625" size="0.4064" layer="27" ratio="10" rot="R180"/>
+<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.525" smashed="yes" rot="R180">
+<attribute name="VALUE" x="30.635" y="17.025" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="44.529375" y="5.715" rot="MR0"/>
-<element name="U1" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="9.68375" smashed="yes" rot="R270"/>
-<element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="13.49375" y="14.366875" smashed="yes" rot="R180">
-<attribute name="NAME" x="13.160375" y="13.668375" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="14.57325" y="15.509875" size="0.4064" layer="27" rot="R180"/>
+<element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="5.715" y="13.573125" smashed="yes" rot="R180">
+<attribute name="NAME" x="5.381625" y="12.874625" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="6.7945" y="14.716125" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="12.3825" smashed="yes">
-<attribute name="NAME" x="18.669" y="10.541" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="18.049875" y="11.2395" size="0.4064" layer="27"/>
+<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="18.653125" y="12.22375" smashed="yes">
+<attribute name="NAME" x="18.19275" y="10.38225" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="17.573625" y="11.08075" size="0.4064" layer="27"/>
 </element>
-<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="6.985" smashed="yes" rot="R180">
-<attribute name="NAME" x="7.604125" y="7.71525" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="10.76325" y="8.128" size="0.4064" layer="27" rot="R180"/>
+<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="4.60375" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="2.524125" y="5.81025" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="5.68325" y="6.223" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
+<element name="CA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
 <attribute name="NAME" x="3.571875" y="10.63625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="-0.9525" y="11.1125" size="1.27" layer="27" rot="R270"/>
 </element>
-<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="11.43" y="4.92125" rot="MR180"/>
-<element name="J1" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="20.240625" y="4.683125" rot="MR90"/>
-<element name="C9" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.6525" rot="R180"/>
-<element name="R3" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
+<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.6525" rot="R180"/>
+<element name="R2" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
 <element name="C3" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="12.065"/>
 <element name="U$6" library="Protofusion" package="THERM_LOGO_SMALL_0.2" value="" x="36.195" y="3.96875"/>
-<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
+<element name="C9" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
+<element name="U1" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
+<element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="23.1775" y="4.7625" rot="MR90"/>
+<element name="R3" library="SparkFun-Passives" package="0402-RES" value="" x="12.7" y="5.08" rot="MR90"/>
+<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="11.43" y="5.08" rot="MR90"/>
+<element name="JP5" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="14.9225" y="5.08" rot="MR180"/>
 </elements>
 <signals>
 <signal name="GND">
 <contactref element="JP2" pad="P2"/>
 <contactref element="U2" pad="2"/>
 <contactref element="SW1" pad="5"/>
-<contactref element="J2" pad="GND"/>
-<contactref element="J2" pad="MT1"/>
-<contactref element="J2" pad="MT2"/>
+<contactref element="JP1" pad="GND"/>
+<contactref element="JP1" pad="MT1"/>
+<contactref element="JP1" pad="MT2"/>
 <contactref element="JP3" pad="P2"/>
 <contactref element="LED1" pad="C"/>
-<contactref element="C8" pad="1"/>
+<contactref element="C10" pad="1"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C7" pad="2"/>
 <polygon width="0.254" layer="16" isolate="0.2032">
@@ -2605,224 +2621,261 @@ design rules under a new name.</descript
 <vertex x="45.085" y="15.24"/>
 <vertex x="0" y="15.24"/>
 </polygon>
-<via x="22.86" y="12.3825" extent="1-16" drill="0.3048"/>
-<wire x1="22.08125" y1="12.3825" x2="22.86" y2="12.3825" width="0.2032" layer="1"/>
-<via x="21.510625" y="5.635625" extent="1-16" drill="0.3048"/>
+<via x="24.13" y="12.3825" extent="1-16" drill="0.3048"/>
+<via x="23.01875" y="6.35" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="6"/>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C6" pad="2"/>
-<contactref element="U1" pad="EXP"/>
-<via x="39.84625" y="10.795" extent="1-16" drill="0.3048"/>
-<wire x1="41.165" y1="10.825" x2="39.87625" y2="10.825" width="0.2032" layer="1"/>
-<wire x1="39.87625" y1="10.825" x2="39.84625" y2="10.795" width="0.2032" layer="1"/>
-<contactref element="RA1" pad="C1A"/>
-<contactref element="RA1" pad="C2A"/>
-<contactref element="RA1" pad="C3A"/>
-<contactref element="RA1" pad="C4A"/>
+<via x="39.84625" y="11.7475" extent="1-16" drill="0.3048"/>
+<contactref element="CA1" pad="C1A"/>
+<contactref element="CA1" pad="C2A"/>
+<contactref element="CA1" pad="C3A"/>
+<contactref element="CA1" pad="C4A"/>
 <wire x1="0.8125" y1="10.725" x2="0.8125" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.125" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
-<via x="14.525625" y="9.68375" extent="1-16" drill="0.3048"/>
-<wire x1="8.335" y1="10.66625" x2="5.08" y2="10.66625" width="0.2032" layer="16"/>
-<via x="10.16" y="5.953125" extent="1-16" drill="0.3048"/>
-<via x="36.35375" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="8.335" y1="10.825" x2="5.159375" y2="10.825" width="0.2032" layer="16"/>
+<via x="36.195" y="10.63625" extent="1-16" drill="0.3048"/>
 <wire x1="37.276128125" y1="11.876128125" x2="37.276128125" y2="11.717378125" width="0.2032" layer="1"/>
-<wire x1="37.276128125" y1="11.717378125" x2="36.35375" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="37.276128125" y1="11.717378125" x2="36.195" y2="10.63625" width="0.2032" layer="1"/>
 <via x="41.43375" y="13.890625" extent="1-16" drill="0.3048"/>
-<wire x1="10.16" y1="5.953125" x2="9.286875" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="9.286875" y1="5.953125" x2="9.04875" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="9.04875" y1="6.19125" x2="9.04875" y2="6.97" width="0.2032" layer="1"/>
-<wire x1="9.04875" y1="6.97" x2="9.03375" y2="6.985" width="0.2032" layer="1"/>
-<via x="11.7475" y="14.366875" extent="1-16" drill="0.3048"/>
+<via x="5.08" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="40.247" y1="14.2875" x2="41.036875" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="41.036875" y1="14.2875" x2="41.43375" y2="13.890625" width="0.2032" layer="1"/>
-<contactref element="J1" pad="2"/>
-<contactref element="U1" pad="31"/>
-<wire x1="16.875625" y1="10.93375" x2="15.775625" y2="10.93375" width="0.2032" layer="1"/>
 <wire x1="43.97375" y1="13.49375" x2="43.84625" y2="13.49375" width="0.2032" layer="1"/>
 <wire x1="43.84625" y1="13.49375" x2="43.815" y2="13.525" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="12.3825" x2="19.779375" y2="13.875625" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="13.875625" x2="19.685" y2="13.97" width="0.2032" layer="1"/>
-<wire x1="19.685" y1="13.97" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
 <via x="42.38625" y="5.635625" extent="1-16" drill="0.3048"/>
 <via x="44.370625" y="13.97" extent="1-16" drill="0.3048"/>
 <wire x1="43.97375" y1="13.49375" x2="43.97375" y2="13.573125" width="0.2032" layer="1"/>
 <wire x1="43.97375" y1="13.573125" x2="44.370625" y2="13.97" width="0.2032" layer="1"/>
 <wire x1="43.815" y1="5.525" x2="43.84625" y2="5.525" width="0.2032" layer="1"/>
-<wire x1="14.525625" y1="9.68375" x2="15.775625" y2="10.93375" width="0.2032" layer="1"/>
-<contactref element="R3" pad="1"/>
+<contactref element="R2" pad="1"/>
 <via x="0.873125" y="6.0325" extent="1-16" drill="0.3048"/>
 <wire x1="0.873125" y1="6.0325" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
-<contactref element="U3" pad="1"/>
-<wire x1="21.510625" y1="5.635625" x2="21.11375" y2="5.635625" width="0.2032" layer="1"/>
-<wire x1="21.11375" y1="5.635625" x2="20.955" y2="5.794375" width="0.2032" layer="1"/>
-<wire x1="29.36875" y1="9.525" x2="25.4" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="25.4" y1="9.525" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
+<contactref element="IC1" pad="1"/>
+<wire x1="29.36875" y1="9.36625" x2="25.24125" y2="9.36625" width="0.2032" layer="1"/>
+<wire x1="25.24125" y1="9.36625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="8.795625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
-<via x="29.36875" y="8.651875" extent="1-16" drill="0.3048"/>
-<wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="29.36875" y1="9.525" x2="29.36875" y2="8.651875" width="0.2032" layer="1"/>
-<wire x1="11.7475" y1="14.366875" x2="12.84375" y2="14.366875" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="11.27125" x2="22.06625" y2="11.7475" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="11.7475" x2="22.06625" y2="12.3675" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="12.3675" x2="22.08125" y2="12.3825" width="0.2032" layer="1"/>
+<wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.36625" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="8.325" x2="0.8125" y2="7.11" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="7.11" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.12875" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.049375" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="20.955" y1="5.794375" x2="20.955" y2="6.573125" width="0.2032" layer="1"/>
-<wire x1="20.955" y1="6.573125" x2="20.94" y2="6.588125" width="0.2032" layer="1"/>
 <wire x1="42.38625" y1="5.635625" x2="43.704375" y2="5.635625" width="0.2032" layer="1"/>
 <wire x1="43.704375" y1="5.635625" x2="43.815" y2="5.525" width="0.2032" layer="1"/>
+<contactref element="U1" pad="16"/>
+<contactref element="U1" pad="32"/>
+<wire x1="14.73625" y1="12.325" x2="13.43625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="13.43625" y1="12.325" x2="13.414375" y2="12.303125" width="0.2032" layer="1"/>
+<via x="13.414375" y="12.303125" extent="1-16" drill="0.3048"/>
+<via x="2.38125" y="5.08" extent="1-16" drill="0.3048"/>
+<wire x1="3.95375" y1="5.08" x2="2.38125" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="6.725" x2="4.97875" y2="6.725" width="0.2032" layer="1"/>
+<wire x1="4.97875" y1="6.725" x2="4.048125" y2="5.794375" width="0.2032" layer="1"/>
+<wire x1="4.048125" y1="5.794375" x2="4.048125" y2="5.174375" width="0.2032" layer="1"/>
+<wire x1="4.048125" y1="5.174375" x2="3.95375" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="22.24" y1="6.35" x2="23.01875" y2="6.35" width="0.2032" layer="1"/>
+<wire x1="41.165" y1="10.825" x2="40.054375" y2="10.825" width="0.2032" layer="1"/>
+<wire x1="40.054375" y1="10.825" x2="39.84625" y2="11.033125" width="0.2032" layer="1"/>
+<wire x1="39.84625" y1="11.033125" x2="39.84625" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="5.065" y1="13.573125" x2="5.08" y2="13.588125" width="0.2032" layer="1"/>
+<wire x1="5.08" y1="13.588125" x2="5.08" y2="14.605" width="0.2032" layer="1"/>
+<contactref element="U1" pad="31"/>
+<wire x1="14.73625" y1="11.525" x2="15.81125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="15.81125" y1="11.525" x2="16.03375" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="11.7475" x2="16.03375" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="12.065" x2="15.795625" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="15.795625" y1="12.303125" x2="14.758125" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="14.758125" y1="12.303125" x2="14.73625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="12.22375" x2="19.303125" y2="13.081875" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="13.081875" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.215" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="11.215" x2="22.519375" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="22.519375" y1="12.144375" x2="23.891875" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="23.891875" y1="12.144375" x2="24.13" y2="12.3825" width="0.2032" layer="1"/>
+<contactref element="J1" pad="2"/>
+<contactref element="R3" pad="2"/>
+<contactref element="C8" pad="2"/>
+<via x="24.28875" y="6.985" extent="1-16" drill="0.3048"/>
+<wire x1="23.97125" y1="8.795625" x2="24.27375" y2="8.795625" width="0.2032" layer="1"/>
+<wire x1="24.27375" y1="8.795625" x2="24.28875" y2="8.810625" width="0.2032" layer="1"/>
+<wire x1="24.28875" y1="8.810625" x2="24.28875" y2="6.985" width="0.2032" layer="1"/>
+<via x="16.430625" y="6.50875" extent="1-16" drill="0.3048"/>
+<wire x1="16.430625" y1="6.50875" x2="19.20875" y2="6.50875" width="0.2032" layer="1"/>
+<wire x1="19.20875" y1="6.50875" x2="20.32" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="20.32" y1="5.3975" x2="22.70125" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="22.70125" y1="5.3975" x2="23.01875" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="23.01875" y1="5.715" x2="23.01875" y2="6.35" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
-<via x="4.445" y="13.6525" extent="1-16" drill="0.3048"/>
-<wire x1="4.445" y1="13.6525" x2="4.83125" y2="13.26625" width="0.2032" layer="16"/>
+<via x="3.175" y="13.6525" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="2"/>
-<wire x1="4.83125" y1="13.26625" x2="8.335" y2="13.26625" width="0.2032" layer="16"/>
-<contactref element="C9" pad="1"/>
-<wire x1="2.2375" y1="13.6525" x2="4.445" y2="13.6525" width="0.2032" layer="1"/>
+<contactref element="C4" pad="1"/>
+<wire x1="2.2375" y1="13.6525" x2="3.175" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="3.481875" y1="13.345625" x2="3.175" y2="13.6525" width="0.2032" layer="16"/>
+<wire x1="3.481875" y1="13.345625" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="13.425" x2="4.51375" y2="13.425" width="0.2032" layer="16"/>
+<wire x1="4.51375" y1="13.425" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$2">
-<via x="5.3975" y="13.890625" extent="1-16" drill="0.3048"/>
+<via x="3.96875" y="13.97" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="1"/>
 <wire x1="1.11125" y1="14.44625" x2="0.9525" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="14.2875" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
-<contactref element="C9" pad="2"/>
+<contactref element="C4" pad="2"/>
 <wire x1="0.9375" y1="13.6525" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
-<wire x1="1.11125" y1="14.44625" x2="4.841875" y2="14.44625" width="0.2032" layer="1"/>
-<wire x1="4.841875" y1="14.44625" x2="5.3975" y2="13.890625" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="13.91625" x2="5.423125" y2="13.91625" width="0.2032" layer="16"/>
-<wire x1="5.423125" y1="13.91625" x2="5.3975" y2="13.890625" width="0.2032" layer="16"/>
+<wire x1="1.11125" y1="14.44625" x2="3.4925" y2="14.44625" width="0.2032" layer="1"/>
+<wire x1="3.4925" y1="14.44625" x2="3.96875" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="5.3975" y1="13.97" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="14.075" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="5.3975" y1="13.97" x2="3.96875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$3">
-<via x="4.445" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="4.54375" y1="11.96625" x2="4.445" y2="12.065" width="0.2032" layer="16"/>
+<via x="3.175" y="12.065" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="4"/>
-<wire x1="4.54375" y1="11.96625" x2="8.335" y2="11.96625" width="0.2032" layer="16"/>
 <contactref element="C3" pad="2"/>
-<wire x1="2.2375" y1="12.065" x2="4.445" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="12.065" x2="3.175" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.125" x2="3.235" y2="12.125" width="0.2032" layer="16"/>
+<wire x1="3.235" y1="12.125" x2="3.175" y2="12.065" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$4">
-<via x="4.445" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="4.6875" y1="12.61625" x2="4.445" y2="12.85875" width="0.2032" layer="16"/>
+<via x="3.175" y="12.85875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="3"/>
-<wire x1="4.6875" y1="12.61625" x2="8.335" y2="12.61625" width="0.2032" layer="16"/>
-<wire x1="4.445" y1="12.85875" x2="1.11125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="12.85875" x2="1.11125" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="1.11125" y1="12.85875" x2="0.9525" y2="12.7" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="12.7" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
 <contactref element="C3" pad="1"/>
 <wire x1="0.9375" y1="12.065" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.775" x2="3.25875" y2="12.775" width="0.2032" layer="16"/>
+<wire x1="3.25875" y1="12.775" x2="3.175" y2="12.85875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$8">
 <via x="3.96875" y="6.50875" extent="1-16" drill="0.3048"/>
-<wire x1="3.96875" y1="6.50875" x2="4.36125" y2="6.11625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="13"/>
-<wire x1="4.36125" y1="6.11625" x2="8.335" y2="6.11625" width="0.2032" layer="16"/>
 <wire x1="3.4925" y1="6.985" x2="3.96875" y2="6.50875" width="0.2032" layer="1"/>
-<contactref element="R3" pad="2"/>
+<contactref element="R2" pad="2"/>
 <wire x1="2.2375" y1="6.985" x2="3.4925" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="6.275" x2="4.2025" y2="6.275" width="0.2032" layer="16"/>
+<wire x1="4.2025" y1="6.275" x2="3.96875" y2="6.50875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$9">
 <via x="3.4925" y="9.04875" extent="1-16" drill="0.3048"/>
 <wire x1="3.33375" y1="6.985" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
-<wire x1="3.33375" y1="6.22075625" x2="4.08825625" y2="5.46625" width="0.2032" layer="16"/>
-<wire x1="4.08825625" y1="5.46625" x2="8.335" y2="5.46625" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="6.985" x2="3.81" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="7.46125" x2="3.81" y2="8.73125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="8.73125" x2="3.4925" y2="9.04875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="14"/>
-<contactref element="RA1" pad="C3B"/>
+<contactref element="CA1" pad="C3B"/>
 <wire x1="2.3625" y1="9.125" x2="3.41625" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="3.41625" y1="9.125" x2="3.4925" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="5.625" x2="3.92950625" y2="5.625" width="0.2032" layer="16"/>
+<wire x1="3.92950625" y1="5.625" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$15">
 <via x="3.175" y="7.77875" extent="1-16" drill="0.3048"/>
 <wire x1="2.8575" y1="7.46125" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
-<wire x1="2.8575" y1="6.022421875" x2="4.063671875" y2="4.81625" width="0.2032" layer="16"/>
-<wire x1="4.063671875" y1="4.81625" x2="8.335" y2="4.81625" width="0.2032" layer="16"/>
 <wire x1="2.8575" y1="7.46125" x2="3.175" y2="7.77875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="15"/>
-<contactref element="RA1" pad="C4B"/>
+<contactref element="CA1" pad="C4B"/>
 <wire x1="2.3625" y1="8.325" x2="3.105" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="3.105" y1="8.325" x2="3.175" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="3.175" y1="8.255" x2="3.175" y2="7.77875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="4.975" x2="7.169375" y2="4.975" width="0.2032" layer="16"/>
+<wire x1="7.169375" y1="4.975" x2="7.14375" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="7.14375" y1="5.000625" x2="7.223125" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="7.223125" y1="5.000625" x2="7.14375" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="7.14375" y1="5.08" x2="3.799921875" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="3.799921875" y1="5.08" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
-<contactref element="C8" pad="2"/>
+<contactref element="C10" pad="2"/>
 <contactref element="C7" pad="1"/>
 <wire x1="22.5425" y1="7.9099" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
-<via x="11.350625" y="13.0175" extent="1-16" drill="0.3048"/>
-<via x="3.81" y="11.27125" extent="1-16" drill="0.3048"/>
+<via x="3.175" y="11.27125" extent="1-16" drill="0.3048"/>
 <wire x1="22.5425" y1="7.9099" x2="22.5425" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="20.558125" y2="8.969375" width="0.2032" layer="1"/>
-<wire x1="20.558125" y1="8.969375" x2="19.84375" y2="9.68375" width="0.2032" layer="1"/>
-<wire x1="19.84375" y1="9.68375" x2="19.84375" y2="11.0603625" width="0.2032" layer="1"/>
-<wire x1="19.84375" y1="11.0603625" x2="19.4741125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="19.4741125" y1="11.43" x2="18.653125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="18.653125" y1="11.43" x2="18.494375" y2="11.58875" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
-<wire x1="8.335" y1="10.01625" x2="8.35" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="3.855" y1="11.31625" x2="8.335" y2="11.31625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="10.175" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
 <contactref element="C1" pad="1"/>
-<contactref element="U1" pad="1"/>
-<contactref element="U1" pad="5"/>
 <contactref element="C2" pad="1"/>
-<contactref element="U1" pad="17"/>
 <contactref element="C6" pad="1"/>
-<contactref element="RA1" pad="C1B"/>
-<contactref element="RA1" pad="C2B"/>
-<via x="4.60375" y="10.00125" extent="1-16" drill="0.3048"/>
-<via x="10.16" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="10.16" y1="8.09625" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="14.3025" y1="12.006875" x2="14.275625" y2="12.03375" width="0.2032" layer="1"/>
-<wire x1="8.35" y1="10.00125" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="10.33375" y1="6.985" x2="10.33375" y2="7.9225" width="0.2032" layer="1"/>
-<wire x1="10.33375" y1="7.9225" x2="10.16" y2="8.09625" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="12.85875" x2="14.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="12.03375" x2="14.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="2.3625" y1="10.725" x2="3.26375" y2="10.725" width="0.2032" layer="1"/>
-<wire x1="3.26375" y1="10.725" x2="3.81" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="10.16" y1="10.00125" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="11.31625" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="16.275625" y1="12.03375" x2="16.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="11.58875" x2="18.494375" y2="12.3675" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="12.3675" x2="18.479375" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="18.479375" y1="12.3825" x2="17.859375" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="17.859375" y1="12.3825" x2="17.383125" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="17.383125" y1="12.85875" x2="16.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="12.775625" y1="7.33375" x2="12.775625" y2="6.8225" width="0.2032" layer="1"/>
-<wire x1="12.775625" y1="6.8225" x2="12.620625" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="12.620625" y1="6.6675" x2="10.65125" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="10.65125" y1="6.6675" x2="10.33375" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="10.16" y1="11.31625" x2="10.16" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="10.16" y1="11.826875" x2="11.350625" y2="13.0175" width="0.2032" layer="16"/>
-<wire x1="14.275625" y1="12.85875" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="13.49375" x2="14.275625" y2="14.235" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="10.01625" x2="4.61875" y2="10.01625" width="0.2032" layer="16"/>
-<wire x1="4.61875" y1="10.01625" x2="4.60375" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="2.3625" y1="9.925" x2="4.5275" y2="9.925" width="0.2032" layer="1"/>
-<wire x1="4.5275" y1="9.925" x2="4.60375" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="3.855" y1="11.31625" x2="3.81" y2="11.27125" width="0.2032" layer="16"/>
-<contactref element="U3" pad="4"/>
-<wire x1="22.24" y1="6.588125" x2="22.24" y2="6.6825" width="0.2032" layer="1"/>
-<wire x1="22.24" y1="6.6825" x2="22.463125" y2="6.905625" width="0.2032" layer="1"/>
-<wire x1="22.463125" y1="6.905625" x2="22.463125" y2="7.830525" width="0.2032" layer="1"/>
-<wire x1="22.463125" y1="7.830525" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
+<contactref element="CA1" pad="C1B"/>
+<contactref element="CA1" pad="C2B"/>
+<via x="3.33375" y="10.00125" extent="1-16" drill="0.3048"/>
+<wire x1="2.3625" y1="10.725" x2="2.62875" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="2.62875" y1="10.725" x2="3.175" y2="11.27125" width="0.2032" layer="1"/>
+<wire x1="17.383125" y1="12.22375" x2="16.748125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="2.3625" y1="9.925" x2="3.2575" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="3.2575" y1="9.925" x2="3.33375" y2="10.00125" width="0.2032" layer="1"/>
+<contactref element="IC1" pad="4"/>
 <wire x1="23.97125" y1="10.095625" x2="23.97125" y2="10.63625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="10.63625" x2="24.13" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="24.13" y1="10.795" x2="25.470625" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="25.470625" y1="10.795" x2="25.55875" y2="10.706875" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="22.845" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.845" y1="8.969375" x2="23.97125" y2="10.095625" width="0.2032" layer="1"/>
-<wire x1="11.350625" y1="13.0175" x2="11.826875" y2="13.49375" width="0.2032" layer="1"/>
-<wire x1="11.826875" y1="13.49375" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="14.235" x2="14.14375" y2="14.366875" width="0.2032" layer="1"/>
+<contactref element="U1" pad="1"/>
+<contactref element="U1" pad="5"/>
+<contactref element="U1" pad="17"/>
+<wire x1="13.43625" y1="13.625" x2="13.43625" y2="14.6625" width="0.2032" layer="1"/>
+<wire x1="13.43625" y1="14.6625" x2="13.255625" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="13.255625" y1="14.843125" x2="10.23625" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="10.23625" y1="13.625" x2="10.23625" y2="14.843125" width="0.2032" layer="1"/>
+<via x="10.239375" y="12.461875" extent="1-16" drill="0.3048"/>
+<wire x1="10.239375" y1="12.461875" x2="10.239375" y2="13.621875" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="13.621875" x2="10.23625" y2="13.625" width="0.2032" layer="1"/>
+<wire x1="7.858125" y1="5.446875" x2="7.83625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="10.23625" y1="14.843125" x2="6.746875" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="20.558125" y1="8.969375" x2="18.003125" y2="11.524375" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.101875" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="5.101875" x2="7.858125" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="7.858125" y1="5.08" x2="7.77875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.6675" y1="5.08" x2="5.25375" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.746875" y1="14.843125" x2="6.429375" y2="14.525625" width="0.2032" layer="1"/>
+<wire x1="6.429375" y1="14.525625" x2="6.429375" y2="13.6375" width="0.2032" layer="1"/>
+<wire x1="6.429375" y1="13.6375" x2="6.365" y2="13.573125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="11.475" x2="3.37875" y2="11.475" width="0.2032" layer="16"/>
+<wire x1="3.37875" y1="11.475" x2="3.175" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="3.33375" y1="10.00125" x2="3.4925" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="3.4925" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="16.748125" y1="12.85875" x2="14.843125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="14.843125" y1="12.85875" x2="14.049375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="13.6525" x2="13.46375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="13.46375" y1="13.6525" x2="13.43625" y2="13.625" width="0.2032" layer="1"/>
+<wire x1="18.003125" y1="12.22375" x2="17.383125" y2="12.22375" width="0.2032" layer="1"/>
+<wire x1="18.003125" y1="11.524375" x2="18.003125" y2="12.22375" width="0.2032" layer="1"/>
+<contactref element="J1" pad="1"/>
+<wire x1="10.795" y1="10.16" x2="10.795" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="11.43" x2="10.795" y2="11.90625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="11.475" x2="10.75" y2="11.475" width="0.2032" layer="16"/>
+<wire x1="10.75" y1="11.475" x2="10.795" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="10.16" x2="10.795" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="10.00125" y1="4.524375" x2="9.68375" y2="4.206875" width="0.2032" layer="16"/>
+<via x="6.6675" y="4.445" extent="1-16" drill="0.3048"/>
+<wire x1="10.00125" y1="4.524375" x2="10.00125" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="10.00125" y1="6.985" x2="10.795" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="9.68375" y1="4.206875" x2="6.905625" y2="4.206875" width="0.2032" layer="16"/>
+<wire x1="6.905625" y1="4.206875" x2="6.6675" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.1375" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="5.1375" x2="7.77875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="7.77875" y1="5.08" x2="6.6675" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.6675" y1="5.08" x2="6.6675" y2="4.445" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="6.35" x2="20.94" y2="6.414375" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="6.414375" x2="22.148125" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="24.4475" y1="4.7625" x2="24.4475" y2="5.635625" width="0.2032" layer="16"/>
+<via x="24.4475" y="5.635625" extent="1-16" drill="0.3048"/>
+<wire x1="22.54" y1="7.9074" x2="22.54" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="23.175" y1="7.6225" x2="23.65375" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="23.65375" y1="7.14375" x2="23.65375" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="23.65375" y1="6.429375" x2="24.4475" y2="5.635625" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="7.6225" x2="23.175" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="7.6225" x2="22.148125" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="11.90625" x2="10.239375" y2="12.461875" width="0.2032" layer="16"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2836,156 +2889,157 @@ design rules under a new name.</descript
 <wire x1="20.79625" y1="9.525" x2="20.6375" y2="9.68375" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="9.68375" x2="20.6375" y2="10.5101" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="10.5101" x2="20.64" y2="10.5076" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="12.3825" x2="20.78125" y2="13.47875" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="13.47875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
-<via x="23.65375" y="12.54125" extent="1-16" drill="0.3048"/>
-<wire x1="23.65375" y1="12.54125" x2="23.65375" y2="11.16018125" width="0.2032" layer="1"/>
-<wire x1="23.65375" y1="11.16018125" x2="23.00116875" y2="10.5076" width="0.2032" layer="1"/>
-<wire x1="23.00116875" y1="10.5076" x2="22.54" y2="10.5076" width="0.2032" layer="1"/>
+<via x="25.479375" y="12.779375" extent="1-16" drill="0.3048"/>
 <wire x1="32.42" y1="14.605" x2="31.115" y2="14.605" width="0.2032" layer="1"/>
 <via x="31.115" y="14.605" extent="1-16" drill="0.3048"/>
-<wire x1="20.64" y1="10.5076" x2="20.64" y2="12.24125" width="0.2032" layer="1"/>
-<wire x1="20.64" y1="12.24125" x2="20.78125" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="23.65375" y1="12.54125" x2="30.216975" y2="12.54125" width="0.2032" layer="16"/>
-<wire x1="30.216975" y1="12.54125" x2="31.115" y2="13.439275" width="0.2032" layer="16"/>
+<wire x1="30.4551" y1="12.779375" x2="31.115" y2="13.439275" width="0.2032" layer="16"/>
 <wire x1="31.115" y1="13.439275" x2="31.115" y2="14.605" width="0.2032" layer="16"/>
+<wire x1="30.4551" y1="12.779375" x2="25.479375" y2="12.779375" width="0.2032" layer="16"/>
+<wire x1="20.64" y1="10.5076" x2="20.64" y2="11.965" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="11.965" x2="20.819375" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="12.144375" x2="20.819375" y2="13.516875" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="13.516875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="25.479375" y1="12.779375" x2="24.13" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="11.43" x2="23.8125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="23.8125" y1="11.43" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.5076" x2="22.54" y2="10.7925" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.7925" x2="22.5425" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="10.795" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
 <via x="32.54375" y="9.128125" extent="1-16" drill="0.3048"/>
-<wire x1="20.16125" y1="10.080625" x2="31.59125" y2="10.080625" width="0.2032" layer="16"/>
-<wire x1="20.16125" y1="10.080625" x2="19.84375" y2="9.763125" width="0.2032" layer="16"/>
-<wire x1="19.84375" y1="9.763125" x2="18.335625" y2="9.763125" width="0.2032" layer="16"/>
-<via x="18.335625" y="9.763125" extent="1-16" drill="0.3048"/>
-<contactref element="U1" pad="28"/>
-<wire x1="16.875625" y1="9.43375" x2="18.00625" y2="9.43375" width="0.2032" layer="1"/>
-<wire x1="18.00625" y1="9.43375" x2="18.335625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="10.398125" x2="31.27375" y2="10.398125" width="0.2032" layer="16"/>
+<via x="18.018125" y="10.239375" extent="1-16" drill="0.3048"/>
 <wire x1="31.58391875" y1="8.16381875" x2="32.54375" y2="9.12365" width="0.2032" layer="1"/>
 <wire x1="32.54375" y1="9.12365" x2="32.54375" y2="9.128125" width="0.2032" layer="1"/>
-<wire x1="31.59125" y1="10.080625" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
+<wire x1="31.27375" y1="10.398125" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
+<contactref element="U1" pad="28"/>
+<wire x1="14.73625" y1="9.125" x2="15.63375" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="16.748125" y1="10.239375" x2="18.018125" y2="10.239375" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="10.398125" x2="19.20875" y2="10.239375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="10.239375" x2="18.018125" y2="10.239375" width="0.2032" layer="16"/>
+<wire x1="15.63375" y1="9.125" x2="16.748125" y2="10.239375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW1" pad="3"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.48891875" y2="6.18391875" width="0.2032" layer="1"/>
 <via x="34.6075" y="7.14375" extent="1-16" drill="0.3048"/>
-<wire x1="19.605625" y1="8.41375" x2="20.47875" y2="9.286875" width="0.2032" layer="16"/>
-<wire x1="20.47875" y1="9.286875" x2="30.63875" y2="9.286875" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="8.41375" x2="18.89125" y2="8.41375" width="0.2032" layer="16"/>
-<via x="18.89125" y="8.41375" extent="1-16" drill="0.3048"/>
-<wire x1="18.768125" y1="8.536875" x2="18.89125" y2="8.41375" width="0.2032" layer="1"/>
-<contactref element="U1" pad="26"/>
-<wire x1="16.875625" y1="8.43375" x2="17.4825" y2="8.43375" width="0.2032" layer="1"/>
-<wire x1="17.4825" y1="8.43375" x2="17.541875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="17.541875" y1="8.493125" x2="18.811875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="18.811875" y1="8.493125" x2="18.89125" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="19.288125" y1="8.969375" x2="19.923125" y2="9.604375" width="0.2032" layer="16"/>
+<wire x1="19.923125" y1="9.604375" x2="30.32125" y2="9.604375" width="0.2032" layer="16"/>
+<via x="19.288125" y="8.969375" extent="1-16" drill="0.3048"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.64766875" y2="6.18391875" width="0.2032" layer="1"/>
 <wire x1="33.64766875" y1="6.18391875" x2="34.6075" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="30.63875" y1="9.286875" x2="32.781875" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="30.32125" y1="9.604375" x2="32.781875" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="32.781875" y1="7.14375" x2="34.6075" y2="7.14375" width="0.2032" layer="16"/>
+<contactref element="U1" pad="26"/>
+<wire x1="14.73625" y1="7.525" x2="15.541875" y2="7.525" width="0.2032" layer="1"/>
+<wire x1="16.98625" y1="8.969375" x2="19.288125" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="15.541875" y1="7.525" x2="16.98625" y2="8.969375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW1" pad="4"/>
 <via x="35.2425" y="11.826875" extent="1-16" drill="0.3048"/>
-<via x="18.0975" y="11.033125" extent="1-16" drill="0.3048"/>
-<contactref element="U1" pad="30"/>
-<wire x1="16.875625" y1="10.43375" x2="17.498125" y2="10.43375" width="0.2032" layer="1"/>
-<wire x1="32.54375" y1="10.874375" x2="20.0025" y2="10.874375" width="0.2032" layer="16"/>
+<via x="16.906875" y="11.58875" extent="1-16" drill="0.3048"/>
+<wire x1="32.54375" y1="11.191875" x2="19.52625" y2="11.191875" width="0.2032" layer="16"/>
 <wire x1="36.286178125" y1="12.866078125" x2="36.281703125" y2="12.866078125" width="0.2032" layer="1"/>
 <wire x1="36.281703125" y1="12.866078125" x2="35.2425" y2="11.826875" width="0.2032" layer="1"/>
-<wire x1="32.54375" y1="10.874375" x2="33.49625" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="33.49625" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="20.0025" y1="10.874375" x2="19.84375" y2="11.033125" width="0.2032" layer="16"/>
-<wire x1="19.84375" y1="11.033125" x2="18.0975" y2="11.033125" width="0.2032" layer="16"/>
-<wire x1="17.498125" y1="10.43375" x2="18.0975" y2="11.033125" width="0.2032" layer="1"/>
+<wire x1="33.17875" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="11.191875" x2="19.129375" y2="11.58875" width="0.2032" layer="16"/>
+<wire x1="19.129375" y1="11.58875" x2="16.906875" y2="11.58875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="30"/>
+<wire x1="16.906875" y1="11.58875" x2="16.51" y2="11.58875" width="0.2032" layer="1"/>
+<wire x1="16.51" y1="11.58875" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="14.73625" y1="10.725" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="32.54375" y1="11.191875" x2="33.17875" y2="11.826875" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW1" pad="6"/>
 <via x="37.30625" y="9.921875" extent="1-16" drill="0.3048"/>
-<wire x1="20.0025" y1="10.4775" x2="32.623125" y2="10.4775" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="10.239375" x2="20.0025" y2="10.4775" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="10.239375" x2="18.970625" y2="10.239375" width="0.2032" layer="16"/>
-<wire x1="18.970625" y1="10.239375" x2="18.811875" y2="10.398125" width="0.2032" layer="16"/>
-<via x="18.811875" y="10.398125" extent="1-16" drill="0.3048"/>
-<wire x1="18.811875" y1="10.398125" x2="18.176875" y2="10.398125" width="0.2032" layer="1"/>
-<wire x1="18.176875" y1="10.398125" x2="17.7125" y2="9.93375" width="0.2032" layer="1"/>
-<contactref element="U1" pad="29"/>
-<wire x1="16.875625" y1="9.93375" x2="17.7125" y2="9.93375" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="10.795" x2="31.4325" y2="10.795" width="0.2032" layer="16"/>
+<wire x1="19.3675" y1="10.795" x2="19.20875" y2="10.95375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="10.95375" x2="17.4625" y2="10.95375" width="0.2032" layer="16"/>
+<via x="17.4625" y="10.95375" extent="1-16" drill="0.3048"/>
 <wire x1="38.266078125" y1="10.886178125" x2="38.266078125" y2="10.881703125" width="0.2032" layer="1"/>
 <wire x1="38.266078125" y1="10.881703125" x2="37.30625" y2="9.921875" width="0.2032" layer="1"/>
-<wire x1="32.623125" y1="10.4775" x2="33.17875" y2="9.921875" width="0.2032" layer="16"/>
-<wire x1="33.17875" y1="9.921875" x2="37.30625" y2="9.921875" width="0.2032" layer="16"/>
+<wire x1="31.4325" y1="10.795" x2="32.305625" y2="9.921875" width="0.2032" layer="16"/>
+<wire x1="32.305625" y1="9.921875" x2="37.30625" y2="9.921875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="29"/>
+<wire x1="14.73625" y1="9.925" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="17.4625" y1="10.95375" x2="16.66875" y2="10.95375" width="0.2032" layer="1"/>
+<wire x1="16.66875" y1="10.95375" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
-<contactref element="J2" pad="D+"/>
+<contactref element="JP1" pad="D+"/>
+<via x="38.4175" y="8.55574375" extent="1-16" drill="0.3048"/>
+<wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="36.67125" y1="6.429375" x2="38.4175" y2="8.175625" width="0.2032" layer="16"/>
+<wire x1="38.4175" y1="8.175625" x2="38.4175" y2="8.55574375" width="0.2032" layer="16"/>
 <contactref element="U1" pad="22"/>
-<wire x1="24.13" y1="6.429375" x2="24.13" y2="5.731878125" width="0.2032" layer="1"/>
-<wire x1="24.13" y1="5.731878125" x2="23.319371875" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="23.319371875" y1="4.92125" x2="18.418125" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="15.275625" y1="7.33375" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
-<contactref element="J1" pad="5"/>
-<wire x1="17.700625" y1="4.683125" x2="17.700625" y2="5.63875" width="0.2032" layer="16"/>
-<via x="17.700625" y="5.63875" extent="1-16" drill="0.3048"/>
-<wire x1="18.418125" y1="4.92125" x2="17.700625" y2="5.63875" width="0.2032" layer="1"/>
-<wire x1="17.700625" y1="5.63875" x2="17.38625" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="17.38625" y1="5.953125" x2="15.636875" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="15.636875" y1="5.953125" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
-<via x="39.0525" y="9.50824375" extent="1-16" drill="0.3048"/>
-<via x="24.13" y="6.429375" extent="1-16" drill="0.3048"/>
-<wire x1="39.0525" y1="9.50824375" x2="41.14824375" y2="9.50824375" width="0.2032" layer="1"/>
-<wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="36.67125" y1="6.429375" x2="24.13" y2="6.429375" width="0.2032" layer="16"/>
-<wire x1="36.67125" y1="6.429375" x2="39.0525" y2="8.810625" width="0.2032" layer="16"/>
-<wire x1="39.0525" y1="8.810625" x2="39.0525" y2="9.50824375" width="0.2032" layer="16"/>
+<via x="12.303125" y="8.89" extent="1-16" drill="0.3048"/>
+<wire x1="41.14824375" y1="9.50824375" x2="39.37" y2="9.50824375" width="0.2032" layer="1"/>
+<wire x1="39.37" y1="9.50824375" x2="38.4175" y2="8.55574375" width="0.2032" layer="1"/>
+<wire x1="36.67125" y1="6.429375" x2="32.623125" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="32.623125" y1="6.429375" x2="31.511875" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="12.303125" y1="8.89" x2="17.30375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="22.06625" y1="8.016875" x2="20.973" y2="6.923625" width="0.2032" layer="16"/>
+<wire x1="20.973" y1="6.923625" x2="19.270125" y2="6.923625" width="0.2032" layer="16"/>
+<wire x1="19.270125" y1="6.923625" x2="17.30375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="31.511875" y1="7.540625" x2="25.24125" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="7.540625" x2="24.765" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="24.765" y1="8.016875" x2="22.06625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="11.826875" y1="7.508628125" x2="12.303125" y2="7.984878125" width="0.2032" layer="1"/>
+<wire x1="12.303125" y1="7.984878125" x2="12.303125" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="11.826875" y1="5.434375" x2="11.826875" y2="7.508628125" width="0.2032" layer="1"/>
+<wire x1="11.826875" y1="5.434375" x2="11.83625" y2="5.425" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
-<contactref element="J2" pad="D-"/>
+<contactref element="JP1" pad="D-"/>
+<via x="39.0525" y="7.9375" extent="1-16" drill="0.3048"/>
+<wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
+<wire x1="36.83" y1="6.0325" x2="38.735" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="38.735" y1="7.9375" x2="39.0525" y2="7.9375" width="0.2032" layer="16"/>
 <contactref element="U1" pad="21"/>
-<wire x1="14.775625" y1="7.33375" x2="14.775625" y2="6.179375" width="0.2032" layer="1"/>
-<contactref element="J1" pad="6"/>
-<via x="15.39875" y="4.683125" extent="1-16" drill="0.3048"/>
-<wire x1="14.775625" y1="6.179375" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="16.430625" y1="4.683125" x2="15.39875" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="17.93875" y1="4.524375" x2="16.906875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="16.906875" y1="5.55625" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="15.39875" y1="5.55625" x2="15.39875" y2="4.683125" width="0.2032" layer="1"/>
-<via x="39.6875" y="8.89" extent="1-16" drill="0.3048"/>
-<wire x1="36.83" y1="6.0325" x2="25.0825" y2="6.0325" width="0.2032" layer="16"/>
-<wire x1="25.0825" y1="6.0325" x2="24.765" y2="5.715" width="0.2032" layer="16"/>
-<via x="24.765" y="5.715" extent="1-16" drill="0.3048"/>
-<wire x1="17.93875" y1="4.524375" x2="23.574375" y2="4.524375" width="0.2032" layer="1"/>
-<wire x1="23.574375" y1="4.524375" x2="24.765" y2="5.715" width="0.2032" layer="1"/>
-<wire x1="39.6875" y1="8.89" x2="41.15" y2="8.89" width="0.2032" layer="1"/>
-<wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
-<wire x1="36.83" y1="6.0325" x2="39.6875" y2="8.89" width="0.2032" layer="16"/>
+<via x="11.43" y="8.09625" extent="1-16" drill="0.3048"/>
+<wire x1="41.15" y1="8.89" x2="40.005" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="40.005" y1="8.89" x2="39.0525" y2="7.9375" width="0.2032" layer="1"/>
+<wire x1="36.83" y1="6.0325" x2="32.385" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="32.385" y1="6.0325" x2="31.4325" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="8.09625" x2="12.85875" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="12.85875" y1="8.09625" x2="13.255625" y2="8.493125" width="0.2032" layer="16"/>
+<wire x1="13.255625" y1="8.493125" x2="17.145" y2="8.493125" width="0.2032" layer="16"/>
+<wire x1="17.145" y1="8.493125" x2="19.0885875" y2="6.5495375" width="0.2032" layer="16"/>
+<wire x1="19.0885875" y1="6.5495375" x2="21.2339125" y2="6.5495375" width="0.2032" layer="16"/>
+<wire x1="21.2339125" y1="6.5495375" x2="22.304375" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="31.4325" y1="6.985" x2="25.24125" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="6.985" x2="24.60625" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="24.60625" y1="7.62" x2="22.304375" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="11.03625" y1="5.425" x2="11.03625" y2="6.035625" width="0.2032" layer="1"/>
+<wire x1="11.03625" y1="6.035625" x2="11.43" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="6.429375" x2="11.43" y2="8.09625" width="0.2032" layer="1"/>
 </signal>
 <signal name="VUSB">
-<contactref element="J2" pad="VBUS"/>
+<contactref element="JP1" pad="VBUS"/>
 <contactref element="D1" pad="A"/>
-<wire x1="41.165" y1="8.225" x2="42.35625" y2="8.225" width="0.2032" layer="1"/>
 <via x="42.38625" y="14.035" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="14.035" x2="41.81625" y2="14.605" width="0.2032" layer="16"/>
 <wire x1="41.81625" y1="14.605" x2="34.925" y2="14.605" width="0.2032" layer="16"/>
 <via x="34.925" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="34.925" y1="14.605" x2="33.72" y2="14.605" width="0.2032" layer="1"/>
-<contactref element="J1" pad="1"/>
-<via x="41.11625" y="5.55625" extent="1-16" drill="0.3048"/>
-<wire x1="39.84625" y1="4.28625" x2="41.11625" y2="5.55625" width="0.2032" layer="16"/>
-<wire x1="42.38625" y1="14.035" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="42.35625" y1="8.225" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="39.84625" y1="4.28625" x2="23.97125" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="23.574375" y1="4.683125" x2="22.780625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="42.38625" y1="8.255" x2="42.38625" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="42.38625" y1="6.82625" x2="41.11625" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="23.97125" y1="4.28625" x2="23.574375" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="41.165" y1="8.225" x2="42.00420625" y2="8.225" width="0.2032" layer="1"/>
+<wire x1="42.00420625" y1="8.225" x2="42.38625" y2="8.60704375" width="0.2032" layer="1"/>
+<wire x1="42.38625" y1="8.60704375" x2="42.38625" y2="14.035" width="0.2032" layer="1"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
 <contactref element="U1" pad="7"/>
-<via x="13.335" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="15.875" y1="13.97" x2="14.44625" y2="13.97" width="0.2032" layer="16"/>
-<wire x1="14.44625" y1="13.97" x2="13.335" y2="12.85875" width="0.2032" layer="16"/>
-<wire x1="13.275625" y1="12.03375" x2="13.275625" y2="12.799375" width="0.2032" layer="1"/>
-<wire x1="13.275625" y1="12.799375" x2="13.335" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="8.63625" y1="13.625" x2="8.63625" y2="12.41231875" width="0.2032" layer="1"/>
+<wire x1="8.63625" y1="12.41231875" x2="9.22169375" y2="11.826875" width="0.2032" layer="1"/>
+<wire x1="9.22169375" y1="11.826875" x2="11.668125" y2="11.826875" width="0.2032" layer="1"/>
+<via x="11.985625" y="12.144375" extent="1-16" drill="0.3048"/>
+<wire x1="11.668125" y1="11.826875" x2="11.985625" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="11.985625" y1="12.144375" x2="13.81125" y2="13.97" width="0.2032" layer="16"/>
+<wire x1="13.81125" y1="13.97" x2="15.875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
@@ -2995,50 +3049,47 @@ design rules under a new name.</descript
 </signal>
 <signal name="LED_PWR">
 <contactref element="R1" pad="1"/>
-<contactref element="U1" pad="32"/>
-<wire x1="19.764375" y1="11.668125" x2="20.16125" y2="11.27125" width="0.2032" layer="16"/>
-<wire x1="20.16125" y1="11.27125" x2="32.385" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="19.05" y1="12.22375" x2="19.685" y2="11.58875" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="11.58875" x2="32.385" y2="11.58875" width="0.2032" layer="16"/>
 <via x="41.195625" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="19.764375" y1="11.668125" x2="17.62125" y2="11.668125" width="0.2032" layer="16"/>
-<via x="17.62125" y="11.668125" extent="1-16" drill="0.3048"/>
-<wire x1="17.62125" y1="11.668125" x2="17.145" y2="11.668125" width="0.2032" layer="1"/>
-<wire x1="17.145" y1="11.668125" x2="16.875625" y2="11.39875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="11.39875" x2="16.875625" y2="11.43375" width="0.2032" layer="1"/>
+<wire x1="19.05" y1="12.22375" x2="14.76375" y2="12.22375" width="0.2032" layer="16"/>
 <wire x1="40.005" y1="13.0025" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
-<wire x1="41.195625" y1="12.85875" x2="33.9725" y2="12.85875" width="0.2032" layer="16"/>
-<wire x1="33.9725" y1="12.85875" x2="32.385" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="41.195625" y1="12.85875" x2="33.655" y2="12.85875" width="0.2032" layer="16"/>
 <wire x1="41.195625" y1="12.85875" x2="40.17875" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="40.17875" y1="12.85875" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
+<wire x1="32.385" y1="11.58875" x2="33.655" y2="12.85875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="2"/>
+<wire x1="14.76375" y1="12.22375" x2="13.97" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.97" y1="11.43" x2="13.335" y2="11.43" width="0.2032" layer="16"/>
+<via x="13.335" y="11.43" extent="1-16" drill="0.3048"/>
+<wire x1="12.63625" y1="13.625" x2="12.63625" y2="12.12875" width="0.2032" layer="1"/>
+<wire x1="12.63625" y1="12.12875" x2="13.335" y2="11.43" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
-<via x="5.715" y="8.41375" extent="1-16" drill="0.3048"/>
-<wire x1="8.32" y1="8.73125" x2="8.255" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="8.255" y1="8.73125" x2="5.87375" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="5.87375" y1="8.73125" x2="5.715" y2="8.5725" width="0.2032" layer="16"/>
-<wire x1="5.715" y1="8.5725" x2="5.715" y2="8.41375" width="0.2032" layer="16"/>
+<via x="4.206875" y="9.445625" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="9"/>
-<wire x1="8.335" y1="8.71625" x2="8.27" y2="8.71625" width="0.2032" layer="16"/>
-<wire x1="8.27" y1="8.71625" x2="8.255" y2="8.73125" width="0.2032" layer="16"/>
 <contactref element="U1" pad="9"/>
-<wire x1="12.175625" y1="11.43375" x2="7.30625" y2="11.43375" width="0.2032" layer="1"/>
-<wire x1="7.30625" y1="11.43375" x2="5.794375" y2="9.921875" width="0.2032" layer="1"/>
-<wire x1="5.794375" y1="9.921875" x2="5.794375" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="5.794375" y1="8.493125" x2="5.715" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="12.325" x2="5.457221875" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="5.457221875" y1="12.325" x2="4.206875" y2="11.074653125" width="0.2032" layer="1"/>
+<wire x1="4.206875" y1="11.074653125" x2="4.206875" y2="9.445625" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="8.875" x2="4.7775" y2="8.875" width="0.2032" layer="16"/>
+<wire x1="4.7775" y1="8.875" x2="4.206875" y2="9.445625" width="0.2032" layer="16"/>
 </signal>
 <signal name="D/!C">
-<via x="6.50875" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="6.53875" y1="8.06625" x2="6.50875" y2="8.09625" width="0.2032" layer="16"/>
+<via x="4.445" y="8.255" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="10"/>
-<wire x1="8.335" y1="8.06625" x2="6.53875" y2="8.06625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="10"/>
-<wire x1="12.175625" y1="10.93375" x2="7.485803125" y2="10.93375" width="0.2032" layer="1"/>
-<wire x1="7.485803125" y1="10.93375" x2="6.50875" y2="9.956696875" width="0.2032" layer="1"/>
-<wire x1="6.50875" y1="9.956696875" x2="6.50875" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="4.92125" y1="8.73125" x2="4.92125" y2="10.894946875" width="0.2032" layer="1"/>
+<wire x1="4.92125" y1="10.894946875" x2="5.551303125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="5.551303125" y1="11.525" x2="6.53625" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.92125" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.475" y2="8.225" width="0.2032" layer="16"/>
+<wire x1="4.475" y1="8.225" x2="8.335" y2="8.225" width="0.2032" layer="16"/>
 </signal>
 <signal name="T-">
 <contactref element="JP4" pad="P2"/>
-<contactref element="C4" pad="1"/>
-<contactref element="U3" pad="2"/>
+<contactref element="C9" pad="1"/>
+<contactref element="IC1" pad="2"/>
 <wire x1="28.09875" y1="10.706875" x2="28.09875" y2="12.288125" width="0.2032" layer="1"/>
 <wire x1="28.09875" y1="12.288125" x2="28.11375" y2="12.303125" width="0.2032" layer="1"/>
 <wire x1="28.11375" y1="12.303125" x2="28.11375" y2="12.87375" width="0.2032" layer="1"/>
@@ -3046,8 +3097,8 @@ design rules under a new name.</descript
 </signal>
 <signal name="T+">
 <contactref element="JP4" pad="P1"/>
-<contactref element="C4" pad="2"/>
-<contactref element="U3" pad="3"/>
+<contactref element="C9" pad="2"/>
+<contactref element="IC1" pad="3"/>
 <wire x1="26.82875" y1="10.706875" x2="26.82875" y2="12.288125" width="0.2032" layer="1"/>
 <wire x1="26.82875" y1="12.288125" x2="26.81375" y2="12.303125" width="0.2032" layer="1"/>
 <wire x1="26.81375" y1="12.303125" x2="26.81375" y2="13.82625" width="0.2032" layer="1"/>
@@ -3057,132 +3108,158 @@ design rules under a new name.</descript
 <contactref element="SW1" pad="2"/>
 <wire x1="32.305625" y1="8.175625" x2="33.575625" y2="8.175625" width="0.2032" layer="16"/>
 <via x="33.575625" y="8.175625" extent="1-16" drill="0.3048"/>
-<wire x1="20.32" y1="9.68375" x2="30.7975" y2="9.68375" width="0.2032" layer="16"/>
-<wire x1="30.7975" y1="9.68375" x2="32.305625" y2="8.175625" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="10.00125" x2="30.48" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="30.48" y1="10.00125" x2="32.305625" y2="8.175625" width="0.2032" layer="16"/>
 <wire x1="33.575625" y1="8.175625" x2="32.57386875" y2="7.17386875" width="0.2032" layer="1"/>
-<wire x1="20.32" y1="9.68375" x2="19.764375" y2="9.128125" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="9.128125" x2="19.288125" y2="9.128125" width="0.2032" layer="16"/>
-<via x="19.288125" y="9.128125" extent="1-16" drill="0.3048"/>
+<wire x1="19.605625" y1="10.00125" x2="19.20875" y2="9.604375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="9.604375" x2="18.7325" y2="9.604375" width="0.2032" layer="16"/>
+<via x="18.7325" y="9.604375" extent="1-16" drill="0.3048"/>
 <contactref element="U1" pad="27"/>
-<wire x1="16.875625" y1="8.93375" x2="18.3" y2="8.93375" width="0.2032" layer="1"/>
-<wire x1="18.3" y1="8.93375" x2="18.494375" y2="9.128125" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="9.128125" x2="19.288125" y2="9.128125" width="0.2032" layer="1"/>
+<wire x1="14.73625" y1="8.325" x2="15.6275" y2="8.325" width="0.2032" layer="1"/>
+<wire x1="16.906875" y1="9.604375" x2="18.7325" y2="9.604375" width="0.2032" layer="1"/>
+<wire x1="15.6275" y1="8.325" x2="16.906875" y2="9.604375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
-<via x="6.50875" y="6.746875" extent="1-16" drill="0.3048"/>
+<via x="4.365625" y="7.223125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
 <contactref element="U1" pad="13"/>
-<wire x1="11.43" y1="8.969375" x2="9.2675" y2="8.969375" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="6.76625" x2="6.528125" y2="6.76625" width="0.2032" layer="16"/>
-<wire x1="6.528125" y1="6.76625" x2="6.50875" y2="6.746875" width="0.2032" layer="16"/>
-<wire x1="9.2675" y1="8.969375" x2="7.045" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="7.045" y1="6.746875" x2="6.50875" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="12.175625" y1="9.43375" x2="11.894375" y2="9.43375" width="0.2032" layer="1"/>
-<wire x1="11.894375" y1="9.43375" x2="11.43" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="9.125" x2="5.556278125" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="5.556278125" y1="9.125" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
+<wire x1="5.3975" y1="8.255" x2="4.365625" y2="7.223125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="6.925" x2="4.66375" y2="6.925" width="0.2032" layer="16"/>
+<wire x1="4.66375" y1="6.925" x2="4.365625" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="5.3975" y1="8.255" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
-<contactref element="U3" pad="7"/>
+<contactref element="IC1" pad="7"/>
 <wire x1="28.09875" y1="5.306875" x2="28.09875" y2="8.651875" width="0.2032" layer="1"/>
-<contactref element="U1" pad="12"/>
 <via x="28.09875" y="8.651875" extent="1-16" drill="0.3048"/>
-<wire x1="26.114375" y1="8.493125" x2="20.79625" y2="8.493125" width="0.2032" layer="16"/>
-<wire x1="20.79625" y1="8.493125" x2="19.52625" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="19.52625" y1="7.223125" x2="13.05498125" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="13.05498125" y1="7.223125" x2="11.191875" y2="9.08623125" width="0.2032" layer="16"/>
-<via x="11.191875" y="9.604375" extent="1-16" drill="0.3048"/>
-<wire x1="26.114375" y1="8.493125" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="25.796875" y1="8.810625" x2="21.669375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="25.796875" y1="8.810625" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="26.590625" y1="8.016875" x2="27.46375" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="27.46375" y1="8.016875" x2="28.09875" y2="8.651875" width="0.2032" layer="16"/>
-<wire x1="12.175625" y1="9.93375" x2="11.52125" y2="9.93375" width="0.2032" layer="1"/>
-<wire x1="11.52125" y1="9.93375" x2="11.191875" y2="9.604375" width="0.2032" layer="1"/>
-<wire x1="11.191875" y1="9.08623125" x2="11.191875" y2="9.604375" width="0.2032" layer="16"/>
+<contactref element="U1" pad="12"/>
+<via x="12.144375" y="10.16" extent="1-16" drill="0.3048"/>
+<wire x1="19.685" y1="7.699375" x2="17.224375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="17.224375" y1="10.16" x2="12.144375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="7.699375" x2="20.558125" y2="7.699375" width="0.2032" layer="16"/>
+<wire x1="20.558125" y1="7.699375" x2="21.669375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="6.53625" y1="9.925" x2="9.29" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="9.29" y1="9.925" x2="9.525" y2="10.16" width="0.2032" layer="1"/>
+<wire x1="9.525" y1="10.16" x2="12.144375" y2="10.16" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_SCK">
-<via x="6.0325" y="7.46125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="11"/>
-<contactref element="U3" pad="5"/>
-<via x="25.55875" y="7.77875" extent="1-16" drill="0.3048"/>
+<contactref element="IC1" pad="5"/>
+<via x="25.479375" y="8.175625" extent="1-16" drill="0.3048"/>
+<wire x1="21.828125" y1="8.41375" x2="25.24125" y2="8.41375" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="8.41375" x2="25.479375" y2="8.175625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="11"/>
-<via x="10.795" y="10.31875" extent="1-16" drill="0.3048"/>
-<wire x1="12.852859375" y1="6.82625" x2="19.685" y2="6.82625" width="0.2032" layer="16"/>
-<wire x1="19.685" y1="6.82625" x2="20.955" y2="8.09625" width="0.2032" layer="16"/>
-<wire x1="20.955" y1="8.09625" x2="25.24125" y2="8.09625" width="0.2032" layer="16"/>
-<wire x1="25.24125" y1="8.09625" x2="25.55875" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="25.55875" y1="5.306875" x2="25.55875" y2="7.77875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="16"/>
-<wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="7.064375" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="1"/>
-<wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="7.064375" y1="7.41625" x2="9.966875" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="9.966875" y1="10.31875" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="12.175625" y1="10.43375" x2="10.91" y2="10.43375" width="0.2032" layer="1"/>
-<wire x1="10.91" y1="10.43375" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="10.556875" y1="10.080625" x2="10.795" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="12.852859375" y1="6.82625" x2="10.556875" y2="9.122234375" width="0.2032" layer="16"/>
-<wire x1="10.556875" y1="9.122234375" x2="10.556875" y2="10.080625" width="0.2032" layer="16"/>
+<via x="11.43" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="19.52625" y1="7.3025" x2="17.30375" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="17.30375" y1="9.525" x2="11.43" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="7.3025" x2="20.716875" y2="7.3025" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="7.3025" x2="21.828125" y2="8.41375" width="0.2032" layer="16"/>
+<wire x1="25.479375" y1="8.175625" x2="25.479375" y2="5.38625" width="0.2032" layer="1"/>
+<wire x1="25.479375" y1="5.38625" x2="25.55875" y2="5.306875" width="0.2032" layer="1"/>
+<via x="11.43" y="8.89" extent="1-16" drill="0.3048"/>
+<via x="10.16" y="8.73125" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="8.73125" x2="11.27125" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="11.27125" y1="8.73125" x2="11.43" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="10.725" x2="11.36" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="7.575" x2="9.7975" y2="7.575" width="0.2032" layer="16"/>
+<wire x1="9.7975" y1="7.575" x2="10.16" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="10.16" y1="7.9375" x2="10.16" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="8.89" x2="11.43" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="9.525" x2="11.43" y2="10.795" width="0.2032" layer="16"/>
+<wire x1="11.36" y1="10.725" x2="11.43" y2="10.795" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
-<via x="5.159375" y="9.36625" extent="1-16" drill="0.3048"/>
-<wire x1="8.335" y1="9.36625" x2="5.159375" y2="9.36625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="8"/>
-<wire x1="12.775625" y1="12.03375" x2="7.27125" y2="12.03375" width="0.2032" layer="1"/>
-<wire x1="7.27125" y1="12.03375" x2="5.159375" y2="9.921875" width="0.2032" layer="1"/>
-<wire x1="5.159375" y1="9.921875" x2="5.159375" y2="9.36625" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="13.625" x2="7.83625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="12.325" x2="8.73125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="8.73125" y1="11.43" x2="11.784809375" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="11.784809375" y1="11.43" x2="12.779375" y2="10.435434375" width="0.2032" layer="1"/>
+<wire x1="12.779375" y1="10.435434375" x2="12.779375" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="9.525" x2="10.16" y2="9.525" width="0.2032" layer="16"/>
+<via x="10.16" y="9.525" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="9.525" x2="12.54125" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="12.54125" y1="9.525" x2="12.779375" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
-<contactref element="U3" pad="6"/>
-<contactref element="U1" pad="25"/>
-<wire x1="19.52625" y1="7.77875" x2="20.6375" y2="8.89" width="0.2032" layer="16"/>
+<contactref element="IC1" pad="6"/>
 <via x="26.82875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="26.82875" y1="8.651875" x2="26.82875" y2="5.306875" width="0.2032" layer="1"/>
-<wire x1="19.52625" y1="7.77875" x2="18.0975" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="18.0975" y1="7.77875" x2="18.018125" y2="7.858125" width="0.2032" layer="16"/>
-<via x="18.018125" y="7.858125" extent="1-16" drill="0.3048"/>
-<wire x1="16.875625" y1="7.93375" x2="17.9425" y2="7.93375" width="0.2032" layer="1"/>
-<wire x1="17.9425" y1="7.93375" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
-<wire x1="20.6375" y1="8.89" x2="26.590625" y2="8.89" width="0.2032" layer="16"/>
-<wire x1="26.590625" y1="8.89" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
+<via x="19.84375" y="8.334375" extent="1-16" drill="0.3048"/>
+<wire x1="26.273125" y1="9.2075" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="25"/>
+<wire x1="14.73625" y1="6.725" x2="15.615" y2="6.725" width="0.2032" layer="1"/>
+<wire x1="15.615" y1="6.725" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
+<wire x1="19.84375" y1="8.334375" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
+<wire x1="26.273125" y1="9.2075" x2="20.716875" y2="9.2075" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="9.2075" x2="19.84375" y2="8.334375" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="U1" pad="19"/>
-<wire x1="13.775625" y1="7.33375" x2="13.775625" y2="6.473125" width="0.2032" layer="1"/>
-<wire x1="13.775625" y1="6.473125" x2="13.49375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="13.49375" y1="6.19125" x2="11.58875" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="11.58875" y1="6.19125" x2="11.43" y2="6.0325" width="0.2032" layer="1"/>
-<contactref element="JP1" pad="P2"/>
-<wire x1="11.43" y1="4.92125" x2="11.43" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="4.206875" x2="9.604375" y2="4.206875" width="0.2032" layer="1"/>
+<wire x1="9.604375" y1="4.206875" x2="9.445625" y2="4.365625" width="0.2032" layer="1"/>
+<wire x1="9.445625" y1="4.365625" x2="9.445625" y2="5.415625" width="0.2032" layer="1"/>
+<wire x1="9.445625" y1="5.415625" x2="9.43625" y2="5.425" width="0.2032" layer="1"/>
+<contactref element="R3" pad="1"/>
+<contactref element="U1" pad="15"/>
+<wire x1="6.53625" y1="7.525" x2="8.588125" y2="7.525" width="0.2032" layer="1"/>
+<wire x1="8.588125" y1="7.525" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
+<wire x1="9.43625" y1="5.425" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
+<contactref element="JP5" pad="P2"/>
+<contactref element="C8" pad="1"/>
+<wire x1="14.049375" y1="4.206875" x2="14.9225" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="4.43" x2="12.7" y2="4.43" width="0.2032" layer="16"/>
+<wire x1="12.7" y1="4.43" x2="14.2725" y2="4.43" width="0.2032" layer="16"/>
+<wire x1="14.2725" y1="4.43" x2="14.9225" y2="5.08" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-RX">
 <contactref element="U1" pad="20"/>
-<wire x1="14.275625" y1="7.33375" x2="14.275625" y2="6.338125" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="6.338125" x2="13.97" y2="6.0325" width="0.2032" layer="1"/>
-<contactref element="JP1" pad="P1"/>
-<wire x1="13.97" y1="6.0325" x2="13.97" y2="4.92125" width="0.2032" layer="1"/>
+<via x="10.795" y="6.6675" extent="1-16" drill="0.3048"/>
+<contactref element="U1" pad="14"/>
+<wire x1="6.53625" y1="8.325" x2="9.7725" y2="8.325" width="0.2032" layer="1"/>
+<contactref element="JP5" pad="P1"/>
+<wire x1="9.7725" y1="8.325" x2="10.239375" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="7.858125" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="6.6675" x2="10.239375" y2="5.428125" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="5.428125" x2="10.23625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="6.6675" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
+<wire x1="17.4625" y1="6.50875" x2="17.4625" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="17.4625" y1="6.50875" x2="16.748125" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="16.748125" y1="7.223125" x2="14.366875" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="14.366875" y1="7.223125" x2="13.81125" y2="6.6675" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="6.6675" x2="13.81125" y2="6.6675" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWCLK">
+<contactref element="U1" pad="24"/>
+<via x="13.414375" y="7.858125" extent="1-16" drill="0.3048"/>
+<wire x1="13.414375" y1="5.446875" x2="13.43625" y2="5.425" width="0.2032" layer="1"/>
 <contactref element="J1" pad="3"/>
-<contactref element="U1" pad="24"/>
-<via x="20.240625" y="5.635625" extent="1-16" drill="0.3048"/>
-<wire x1="20.32" y1="4.7625" x2="20.240625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="20.240625" y1="5.635625" x2="20.240625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="20.240625" y1="5.635625" x2="20.240625" y2="6.111875" width="0.2032" layer="1"/>
-<wire x1="20.240625" y1="6.111875" x2="19.605625" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="19.605625" y1="6.746875" x2="16.430625" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="16.430625" y1="6.746875" x2="16.275625" y2="6.901875" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="7.33375" x2="16.275625" y2="6.901875" width="0.2032" layer="1"/>
+<wire x1="13.414375" y1="7.858125" x2="13.573125" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="13.573125" y1="8.016875" x2="17.065625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="17.065625" y1="8.016875" x2="18.89125" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="18.89125" y1="6.19125" x2="21.11375" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="13.414375" y1="5.446875" x2="13.414375" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="21.11375" y1="6.19125" x2="21.9075" y2="5.3975" width="0.2032" layer="16"/>
+<wire x1="21.9075" y1="5.3975" x2="21.9075" y2="4.7625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWDIO">
+<contactref element="U1" pad="23"/>
 <contactref element="J1" pad="4"/>
-<contactref element="U1" pad="23"/>
-<wire x1="15.775625" y1="7.33375" x2="15.775625" y2="6.449375" width="0.2032" layer="1"/>
-<via x="18.970625" y="5.635625" extent="1-16" drill="0.3048"/>
-<wire x1="19.05" y1="4.7625" x2="18.970625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="15.775625" y1="6.449375" x2="15.875" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="15.875" y1="6.35" x2="18.811875" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="18.811875" y1="6.35" x2="18.970625" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="18.970625" y1="6.19125" x2="18.970625" y2="5.635625" width="0.2032" layer="1"/>
-<wire x1="18.970625" y1="5.635625" x2="18.970625" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="20.6375" y1="4.7625" x2="19.764375" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="4.7625" x2="16.906875" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="16.906875" y1="7.62" x2="14.12875" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="14.12875" y1="7.62" x2="13.6525" y2="7.14375" width="0.2032" layer="16"/>
+<via x="12.620625" y="7.3025" extent="1-16" drill="0.3048"/>
+<wire x1="12.620625" y1="7.3025" x2="12.620625" y2="5.440625" width="0.2032" layer="1"/>
+<wire x1="12.620625" y1="5.440625" x2="12.63625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="13.6525" y1="7.14375" x2="12.779375" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="12.779375" y1="7.14375" x2="12.620625" y2="7.3025" width="0.2032" layer="16"/>
 </signal>
 </signals>
 </board>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="6.5.0">
+<eagle version="7.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -64,6 +64,8 @@
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
 <layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
+<layer number="90" name="Modules" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="yes"/>
@@ -229,10 +231,10 @@
 <wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="51"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
 <smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
@@ -248,8 +250,25 @@
 <smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
+<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
 <text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
 <text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
+<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
+<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
+<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
+<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
+<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
+<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
+<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
+<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
+<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
+<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
+<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
+<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
+<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
+<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
+<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
 </package>
 </packages>
 <symbols>
@@ -290,7 +309,7 @@
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="GND">
+<deviceset name="GND" prefix="SUP">
 <description>&lt;b&gt;GND&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="GND" x="0" y="0"/>
@@ -303,7 +322,7 @@
 </device>
 </devices>
 </deviceset>
-<deviceset name="3.3V">
+<deviceset name="3.3V" prefix="SUP">
 <description>&lt;b&gt;3.3V Supply&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="3.3V" x="0" y="0"/>
@@ -2284,125 +2303,6 @@ 5V - VREG-00823</description>
 </library>
 <library name="Protofusion">
 <packages>
-<package name="UFQFPN32">
-<wire x1="-2.4" y1="2.4" x2="2.4" y2="2.4" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="2.4" x2="2.4" y2="-2.4" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="-2.4" x2="-2.4" y2="-2.4" width="0.2032" layer="51"/>
-<wire x1="-2.4" y1="-2.4" x2="-2.4" y2="2.4" width="0.2032" layer="51"/>
-<wire x1="-2.55" y1="1.75" x2="-2.15" y2="1.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="1.75" x2="-2.15" y2="1.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="1.25" x2="-2.15" y2="1.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="1.25" x2="-2.15" y2="1.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="0.75" x2="-2.15" y2="0.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="0.75" x2="-2.15" y2="0.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="0.25" x2="-2.15" y2="0.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="0.25" x2="-2.15" y2="0.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-0.25" x2="-2.15" y2="-0.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-0.25" x2="-2.15" y2="-0.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-0.75" x2="-2.15" y2="-0.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-0.75" x2="-2.15" y2="-0.75" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-1.25" x2="-2.15" y2="-1.25" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-1.25" x2="-2.15" y2="-1.25" width="0.225" layer="31"/>
-<wire x1="-2.55" y1="-1.75" x2="-2.15" y2="-1.75" width="0.35" layer="29"/>
-<wire x1="-2.55" y1="-1.75" x2="-2.15" y2="-1.75" width="0.225" layer="31"/>
-<wire x1="-1.75" y1="-2.55" x2="-1.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-1.75" y1="-2.55" x2="-1.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-1.25" y1="-2.55" x2="-1.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-1.25" y1="-2.55" x2="-1.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-0.75" y1="-2.55" x2="-0.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-0.75" y1="-2.55" x2="-0.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="-0.25" y1="-2.55" x2="-0.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="-0.25" y1="-2.55" x2="-0.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="0.25" y1="-2.55" x2="0.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="0.25" y1="-2.55" x2="0.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="0.75" y1="-2.55" x2="0.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="0.75" y1="-2.55" x2="0.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="1.25" y1="-2.55" x2="1.25" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="1.25" y1="-2.55" x2="1.25" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="1.75" y1="-2.55" x2="1.75" y2="-2.15" width="0.35" layer="29"/>
-<wire x1="1.75" y1="-2.55" x2="1.75" y2="-2.15" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-1.75" x2="2.15" y2="-1.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-1.75" x2="2.15" y2="-1.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-1.25" x2="2.15" y2="-1.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-1.25" x2="2.15" y2="-1.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-0.75" x2="2.15" y2="-0.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-0.75" x2="2.15" y2="-0.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="-0.25" x2="2.15" y2="-0.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="-0.25" x2="2.15" y2="-0.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="0.25" x2="2.15" y2="0.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="0.25" x2="2.15" y2="0.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="0.75" x2="2.15" y2="0.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="0.75" x2="2.15" y2="0.75" width="0.225" layer="31"/>
-<wire x1="2.55" y1="1.25" x2="2.15" y2="1.25" width="0.35" layer="29"/>
-<wire x1="2.55" y1="1.25" x2="2.15" y2="1.25" width="0.225" layer="31"/>
-<wire x1="2.55" y1="1.75" x2="2.15" y2="1.75" width="0.35" layer="29"/>
-<wire x1="2.55" y1="1.75" x2="2.15" y2="1.75" width="0.225" layer="31"/>
-<wire x1="1.75" y1="2.55" x2="1.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="1.75" y1="2.55" x2="1.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="1.25" y1="2.55" x2="1.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="1.25" y1="2.55" x2="1.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="0.75" y1="2.55" x2="0.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="0.75" y1="2.55" x2="0.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="0.25" y1="2.55" x2="0.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="0.25" y1="2.55" x2="0.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-0.25" y1="2.55" x2="-0.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-0.25" y1="2.55" x2="-0.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-0.75" y1="2.55" x2="-0.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-0.75" y1="2.55" x2="-0.75" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-1.25" y1="2.55" x2="-1.25" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-1.25" y1="2.55" x2="-1.25" y2="2.15" width="0.225" layer="31"/>
-<wire x1="-1.75" y1="2.55" x2="-1.75" y2="2.15" width="0.35" layer="29"/>
-<wire x1="-1.75" y1="2.55" x2="-1.75" y2="2.15" width="0.225" layer="31"/>
-<smd name="1" x="-2.35" y="1.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="2" x="-2.35" y="1.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="3" x="-2.35" y="0.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="4" x="-2.35" y="0.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="5" x="-2.35" y="-0.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="6" x="-2.35" y="-0.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="7" x="-2.35" y="-1.25" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="8" x="-2.35" y="-1.75" dx="0.7" dy="0.3" layer="1" roundness="100" stop="no" cream="no"/>
-<smd name="9" x="-1.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="10" x="-1.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="11" x="-0.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="12" x="-0.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="13" x="0.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="14" x="0.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="15" x="1.25" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="16" x="1.75" y="-2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R90" stop="no" cream="no"/>
-<smd name="17" x="2.35" y="-1.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="18" x="2.35" y="-1.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="19" x="2.35" y="-0.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="20" x="2.35" y="-0.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="21" x="2.35" y="0.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="22" x="2.35" y="0.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="23" x="2.35" y="1.25" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="24" x="2.35" y="1.75" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R180" stop="no" cream="no"/>
-<smd name="25" x="1.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="26" x="1.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="27" x="0.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="28" x="0.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="29" x="-0.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="30" x="-0.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="31" x="-1.25" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="32" x="-1.75" y="2.35" dx="0.7" dy="0.3" layer="1" roundness="100" rot="R270" stop="no" cream="no"/>
-<smd name="EXP" x="0" y="0" dx="3.5" dy="3.5" layer="1" roundness="10" stop="no" cream="no"/>
-<rectangle x1="-2.45" y1="2" x2="-2" y2="2.45" layer="21"/>
-<rectangle x1="-2.45" y1="0" x2="0" y2="2.45" layer="51"/>
-<rectangle x1="-1.5" y1="0.25" x2="-0.25" y2="1.5" layer="31"/>
-<rectangle x1="0.25" y1="0.25" x2="1.5" y2="1.5" layer="31"/>
-<rectangle x1="0.25" y1="-1.5" x2="1.5" y2="-0.25" layer="31"/>
-<rectangle x1="-1.5" y1="-1.5" x2="-0.25" y2="-0.25" layer="31"/>
-<polygon width="0.2" layer="29">
-<vertex x="-1.75" y="1.25"/>
-<vertex x="-1.25" y="1.75"/>
-<vertex x="1.5" y="1.75" curve="-90"/>
-<vertex x="1.75" y="1.5"/>
-<vertex x="1.75" y="-1.5" curve="-90"/>
-<vertex x="1.5" y="-1.75"/>
-<vertex x="-1.5" y="-1.75" curve="-90"/>
-<vertex x="-1.75" y="-1.5"/>
-</polygon>
-</package>
 <package name="1206-ARV-4">
 <wire x1="-1.55" y1="0.75" x2="-1.35" y2="0.75" width="0.1016" layer="51"/>
 <wire x1="-1.05" y1="0.75" x2="-0.55" y2="0.75" width="0.1016" layer="51"/>
@@ -2443,204 +2343,121 @@ 5V - VREG-00823</description>
 <text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
-<package name="POGOPROG-CONN">
-<description>Standard pogo pin programming header with two alignment holes. Small SMD pads.</description>
-<smd name="3" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="3.81" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<hole x="0" y="5.08" drill="0.508"/>
-<hole x="0" y="-3.81" drill="0.508"/>
-<wire x1="-0.635" y1="5.715" x2="0.635" y2="5.715" width="0.127" layer="21"/>
-<wire x1="0.635" y1="5.715" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="5.715" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="3.175"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="0.635" y="5.715"/>
-<vertex x="-0.635" y="5.715"/>
-</polygon>
-<text x="-1.27" y="6.35" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-<circle x="0" y="5.08" radius="0.635" width="0" layer="29"/>
-<circle x="0" y="-3.81" radius="0.635" width="0" layer="29"/>
-<circle x="0" y="-3.81" radius="0.635" width="0" layer="30"/>
-<circle x="0" y="5.08" radius="0.635" width="0" layer="30"/>
+<package name="LQFP32">
+<wire x1="-3.5" y1="3.15" x2="-3.5" y2="-3.15" width="0.1524" layer="51"/>
+<wire x1="-3.5" y1="-3.15" x2="-3.15" y2="-3.5" width="0.1524" layer="51"/>
+<wire x1="-3.15" y1="-3.5" x2="3.15" y2="-3.5" width="0.1524" layer="51"/>
+<wire x1="3.15" y1="-3.5" x2="3.5" y2="-3.15" width="0.1524" layer="51"/>
+<wire x1="3.5" y1="-3.15" x2="3.5" y2="3.15" width="0.1524" layer="51"/>
+<wire x1="3.5" y1="3.15" x2="3.15" y2="3.5" width="0.1524" layer="51"/>
+<wire x1="3.15" y1="3.5" x2="-3.15" y2="3.5" width="0.1524" layer="51"/>
+<wire x1="-3.15" y1="3.5" x2="-3.5" y2="3.15" width="0.1524" layer="51"/>
+<wire x1="-3.35" y1="3.088" x2="-3.35" y2="-3.088" width="0.0762" layer="51"/>
+<wire x1="-3.35" y1="-3.088" x2="-3.088" y2="-3.35" width="0.0762" layer="51"/>
+<wire x1="-3.088" y1="-3.35" x2="3.088" y2="-3.35" width="0.0762" layer="51"/>
+<wire x1="3.088" y1="-3.35" x2="3.35" y2="-3.088" width="0.0762" layer="51"/>
+<wire x1="3.35" y1="-3.088" x2="3.35" y2="3.088" width="0.0762" layer="51"/>
+<wire x1="3.35" y1="3.088" x2="3.088" y2="3.35" width="0.0762" layer="51"/>
+<wire x1="3.088" y1="3.35" x2="-3.088" y2="3.35" width="0.0762" layer="51"/>
+<wire x1="-3.088" y1="3.35" x2="-3.35" y2="3.088" width="0.0762" layer="51"/>
+<wire x1="-3.235" y1="3.04" x2="-3.235" y2="-3.04" width="0.1524" layer="21"/>
+<wire x1="-3.235" y1="-3.04" x2="-3.04" y2="-3.235" width="0.1524" layer="21"/>
+<wire x1="-3.04" y1="-3.235" x2="3.04" y2="-3.235" width="0.1524" layer="21"/>
+<wire x1="3.04" y1="-3.235" x2="3.235" y2="-3.04" width="0.1524" layer="21"/>
+<wire x1="3.235" y1="-3.04" x2="3.235" y2="3.04" width="0.1524" layer="21"/>
+<wire x1="3.235" y1="3.04" x2="3.04" y2="3.235" width="0.1524" layer="21"/>
+<wire x1="3.04" y1="3.235" x2="-3.04" y2="3.235" width="0.1524" layer="21"/>
+<wire x1="-3.04" y1="3.235" x2="-3.235" y2="3.04" width="0.1524" layer="21"/>
+<circle x="-2.37" y="2.37" radius="0.475" width="0.1524" layer="21"/>
+<smd name="1" x="-4.1" y="2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="2" x="-4.1" y="2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="3" x="-4.1" y="1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="4" x="-4.1" y="0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="5" x="-4.1" y="-0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="6" x="-4.1" y="-1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="7" x="-4.1" y="-2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="8" x="-4.1" y="-2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="9" x="-2.8" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="10" x="-2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="11" x="-1.2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="12" x="-0.4" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="13" x="0.4" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="14" x="1.2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="15" x="2" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="16" x="2.8" y="-4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="17" x="4.1" y="-2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="18" x="4.1" y="-2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="19" x="4.1" y="-1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="20" x="4.1" y="-0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="21" x="4.1" y="0.4" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="22" x="4.1" y="1.2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="23" x="4.1" y="2" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="24" x="4.1" y="2.8" dx="0.5" dy="1.45" layer="1" rot="R270"/>
+<smd name="25" x="2.8" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="26" x="2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="27" x="1.2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="28" x="0.4" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="29" x="-0.4" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="30" x="-1.2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="31" x="-2" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<smd name="32" x="-2.8" y="4.1" dx="0.5" dy="1.45" layer="1"/>
+<text x="-3" y="5" size="1.27" layer="21" ratio="10">&gt;NAME</text>
+<rectangle x1="-4.185" y1="2.3" x2="-3.815" y2="3.3" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="1.5" x2="-3.815" y2="2.5" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-3.3" x2="-3.815" y2="-2.3" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-2.5" x2="-3.815" y2="-1.5" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-1.7" x2="-3.815" y2="-0.7" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-0.9" x2="-3.815" y2="0.1" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="-0.1" x2="-3.815" y2="0.9" layer="51" rot="R270"/>
+<rectangle x1="-4.185" y1="0.7" x2="-3.815" y2="1.7" layer="51" rot="R270"/>
+<rectangle x1="-2.985" y1="-4.5" x2="-2.615" y2="-3.5" layer="51"/>
+<rectangle x1="-2.185" y1="-4.5" x2="-1.815" y2="-3.5" layer="51"/>
+<rectangle x1="2.615" y1="-4.5" x2="2.985" y2="-3.5" layer="51"/>
+<rectangle x1="1.815" y1="-4.5" x2="2.185" y2="-3.5" layer="51"/>
+<rectangle x1="1.015" y1="-4.5" x2="1.385" y2="-3.5" layer="51"/>
+<rectangle x1="0.215" y1="-4.5" x2="0.585" y2="-3.5" layer="51"/>
+<rectangle x1="-0.585" y1="-4.5" x2="-0.215" y2="-3.5" layer="51"/>
+<rectangle x1="-1.385" y1="-4.5" x2="-1.015" y2="-3.5" layer="51"/>
+<rectangle x1="3.815" y1="-3.3" x2="4.185" y2="-2.3" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-2.5" x2="4.185" y2="-1.5" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="2.3" x2="4.185" y2="3.3" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="1.5" x2="4.185" y2="2.5" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="0.7" x2="4.185" y2="1.7" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-0.1" x2="4.185" y2="0.9" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-0.9" x2="4.185" y2="0.1" layer="51" rot="R90"/>
+<rectangle x1="3.815" y1="-1.7" x2="4.185" y2="-0.7" layer="51" rot="R90"/>
+<rectangle x1="2.615" y1="3.5" x2="2.985" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="1.815" y1="3.5" x2="2.185" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-2.985" y1="3.5" x2="-2.615" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-2.185" y1="3.5" x2="-1.815" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-1.385" y1="3.5" x2="-1.015" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="-0.585" y1="3.5" x2="-0.215" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="0.215" y1="3.5" x2="0.585" y2="4.5" layer="51" rot="R180"/>
+<rectangle x1="1.015" y1="3.5" x2="1.385" y2="4.5" layer="51" rot="R180"/>
 </package>
-<package name="POGOPROG-CONN-0H">
-<description>No holes, 2 vias, pogo pin programming header.</description>
-<smd name="3" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="4.445" x2="0.635" y2="4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="4.445" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
+<package name="POGOPROG-CONN-4-ALLSMT">
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
+<wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
 <wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="1.905"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="0.635" y="4.445"/>
-<vertex x="-0.635" y="4.445"/>
-</polygon>
-<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
-<pad name="1" x="0" y="3.81" drill="0.4572"/>
-<pad name="6" x="0" y="-2.54" drill="0.4572"/>
-</package>
-<package name="POGOPROG-CONN-1H">
-<description>Standard pogo pin programming header with ONE alignment hole. Small SMD pads.</description>
-<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<hole x="0" y="3.81" drill="0.5"/>
-<wire x1="-0.635" y1="4.445" x2="0.635" y2="4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="4.445" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="1.905"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="0.635" y="4.445"/>
-<vertex x="-0.635" y="4.445"/>
-</polygon>
-<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-<package name="POGOPROG-CONN-OH-SMALLERVIAS">
-<description>No holes, 2 vias, pogo pin programming header. With smaller vias.</description>
-<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
-<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="1.905" width="0.127" layer="21"/>
 <polygon width="0.127" layer="21">
 <vertex x="-0.635" y="0.635"/>
 <vertex x="0.635" y="0.635"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="-0.635" y="3.175"/>
-</polygon>
-<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-<pad name="1" x="0" y="2.54" drill="0.381"/>
-<pad name="6" x="0" y="-3.81" drill="0.381"/>
-</package>
-<package name="POGOPROG-CONN-W">
-<description>Standard pogo pin programming header with two alignment holes. WIDE smd pads.</description>
-<smd name="3" x="0" y="0" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="2.54" dx="1.143" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="1.143" dy="0.8128" layer="1"/>
-<hole x="0" y="3.81" drill="0.5"/>
-<hole x="0" y="-5.08" drill="0.5"/>
-<wire x1="-0.635" y1="4.445" x2="0.635" y2="4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="4.445" x2="0.635" y2="-5.715" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-5.715" x2="-0.635" y2="-5.715" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-5.715" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-3.81" dx="1.143" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
+<vertex x="0.635" y="1.905"/>
 <vertex x="-0.635" y="1.905"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="0.635" y="4.445"/>
-<vertex x="-0.635" y="4.445"/>
 </polygon>
-<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-7.62" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-<package name="POGOPROG-CONN-OH-1V">
-<description>No holes, 1 via, pogo pin programming header.</description>
-<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
-<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="0.635"/>
-<vertex x="0.635" y="0.635"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="-0.635" y="3.175"/>
-</polygon>
-<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-<pad name="1" x="0" y="2.54" drill="0.4572"/>
-<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
-</package>
-<package name="POGOPROG-CONN-ALLSMT">
-<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
-<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="1.905"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="-0.635" y="3.175"/>
-</polygon>
-<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+<text x="-2.54" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="0" y1="3.81" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0.3175" y1="2.8575" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0" y1="2.54" x2="-0.3175" y2="2.8575" width="0.127" layer="21"/>
 </package>
 </packages>
 <symbols>
-<symbol name="STM32F042K">
-<wire x1="-35.56" y1="43.18" x2="40.64" y2="43.18" width="0.254" layer="94"/>
-<wire x1="40.64" y1="43.18" x2="40.64" y2="-5.08" width="0.254" layer="94"/>
-<wire x1="40.64" y1="-5.08" x2="-35.56" y2="-5.08" width="0.254" layer="94"/>
-<text x="-35.56" y="45.72" size="2.54" layer="95">&gt;NAME</text>
-<text x="-35.56" y="-10.16" size="2.54" layer="96">&gt;VALUE</text>
-<pin name="VDD" x="-40.64" y="38.1" length="middle"/>
-<pin name="PF0/I2C1_SDA" x="-40.64" y="35.56" length="middle"/>
-<pin name="PF1/I2C1_SCL" x="-40.64" y="33.02" length="middle"/>
-<pin name="NRST" x="-40.64" y="30.48" length="middle"/>
-<pin name="VDDA" x="-40.64" y="27.94" length="middle"/>
-<pin name="PA0/ADC0" x="-40.64" y="25.4" length="middle"/>
-<pin name="PA1/ADC1" x="-40.64" y="22.86" length="middle"/>
-<pin name="PA2/ADC2/USART2_TX" x="-40.64" y="20.32" length="middle"/>
-<pin name="PA3/ADC3/USART2_RX" x="-40.64" y="17.78" length="middle"/>
-<pin name="PA4/ADC4" x="-40.64" y="15.24" length="middle"/>
-<pin name="PA5/ADC5/SPI1_SCK" x="-40.64" y="12.7" length="middle"/>
-<pin name="PA6/ADC6/SPI1_MISO" x="-40.64" y="10.16" length="middle"/>
-<pin name="PA7/ADC7/SPI1_MOSI" x="-40.64" y="7.62" length="middle"/>
-<pin name="PB0/ADC8" x="-40.64" y="5.08" length="middle"/>
-<pin name="PB1/ADC9" x="-40.64" y="2.54" length="middle"/>
-<pin name="PB2" x="-40.64" y="0" length="middle"/>
-<pin name="VDDIO2" x="45.72" y="0" length="middle" rot="R180"/>
-<pin name="PA8" x="45.72" y="2.54" length="middle" rot="R180"/>
-<pin name="USART1_TX/I2C1_SCL/PA9" x="45.72" y="5.08" length="middle" rot="R180"/>
-<pin name="USART1_RX/I2C1_SDA/PA10" x="45.72" y="7.62" length="middle" rot="R180"/>
-<pin name="CAN_RX/I2C1_SCL/USB_DM/PA11" x="45.72" y="10.16" length="middle" rot="R180"/>
-<pin name="CAN_TX/I2C1_SDA/USB_DP/PA12" x="45.72" y="12.7" length="middle" rot="R180"/>
-<pin name="SWDIO/PA13" x="45.72" y="15.24" length="middle" rot="R180"/>
-<pin name="USART2_TX/SWCLK/PA14" x="45.72" y="17.78" length="middle" rot="R180"/>
-<pin name="USART2_RX/PA15" x="45.72" y="20.32" length="middle" rot="R180"/>
-<pin name="SPI1_SCK/PB3" x="45.72" y="22.86" length="middle" rot="R180"/>
-<pin name="SPI1_MISO/PB4" x="45.72" y="25.4" length="middle" rot="R180"/>
-<pin name="SPI1_MOSI/PB5" x="45.72" y="27.94" length="middle" rot="R180"/>
-<pin name="I2C1_SCL/USART1_TX/PB6" x="45.72" y="30.48" length="middle" rot="R180"/>
-<pin name="I2C1_SDA/USART1_RX/PB7" x="45.72" y="33.02" length="middle" rot="R180"/>
-<pin name="BOOT0-PF11" x="45.72" y="35.56" length="middle" rot="R180"/>
-<pin name="I2C1_SCL/CAN_RX/PB8" x="45.72" y="38.1" length="middle" rot="R180"/>
-<wire x1="-35.56" y1="43.18" x2="-35.56" y2="-5.08" width="0.254" layer="94"/>
-<pin name="GND" x="0" y="-10.16" length="middle" rot="R90"/>
-</symbol>
 <symbol name="C">
 <wire x1="0" y1="0" x2="0" y2="1.016" width="0.1524" layer="94"/>
 <wire x1="0" y1="2.54" x2="0" y2="1.778" width="0.1524" layer="94"/>
@@ -2653,67 +2470,57 @@ 5V - VREG-00823</description>
 <wire x1="-0.762" y1="1.016" x2="0" y2="1.016" width="0.4064" layer="94"/>
 <wire x1="0" y1="1.016" x2="0.762" y2="1.016" width="0.4064" layer="94"/>
 </symbol>
-<symbol name="POGOPROG-CONN">
-<pin name="MOSI" x="-2.54" y="-5.08" length="short"/>
-<pin name="MISO" x="-2.54" y="-2.54" length="short"/>
-<pin name="SCK" x="-2.54" y="0" length="short"/>
-<pin name="\RST" x="-2.54" y="-7.62" length="short"/>
+<symbol name="STM32F042K-T">
+<wire x1="-40.64" y1="22.86" x2="35.56" y2="22.86" width="0.254" layer="94"/>
+<wire x1="35.56" y1="22.86" x2="35.56" y2="-25.4" width="0.254" layer="94"/>
+<wire x1="35.56" y1="-25.4" x2="-40.64" y2="-25.4" width="0.254" layer="94"/>
+<text x="-40.64" y="25.4" size="2.54" layer="95">&gt;NAME</text>
+<text x="-40.64" y="-30.48" size="2.54" layer="96">&gt;VALUE</text>
+<pin name="VDD" x="-45.72" y="17.78" length="middle"/>
+<pin name="PF0/I2C1_SDA" x="-45.72" y="15.24" length="middle"/>
+<pin name="PF1/I2C1_SCL" x="-45.72" y="12.7" length="middle"/>
+<pin name="NRST" x="-45.72" y="10.16" length="middle"/>
+<pin name="VDDA" x="-45.72" y="7.62" length="middle"/>
+<pin name="PA0/ADC0" x="-45.72" y="5.08" length="middle"/>
+<pin name="PA1/ADC1" x="-45.72" y="2.54" length="middle"/>
+<pin name="PA2/ADC2/USART2_TX" x="-45.72" y="0" length="middle"/>
+<pin name="PA3/ADC3/USART2_RX" x="-45.72" y="-2.54" length="middle"/>
+<pin name="PA4/ADC4" x="-45.72" y="-5.08" length="middle"/>
+<pin name="PA5/ADC5/SPI1_SCK" x="-45.72" y="-7.62" length="middle"/>
+<pin name="PA6/ADC6/SPI1_MISO" x="-45.72" y="-10.16" length="middle"/>
+<pin name="PA7/ADC7/SPI1_MOSI" x="-45.72" y="-12.7" length="middle"/>
+<pin name="PB0/ADC8" x="-45.72" y="-15.24" length="middle"/>
+<pin name="PB1/ADC9" x="-45.72" y="-17.78" length="middle"/>
+<pin name="VDDIO2" x="40.64" y="-20.32" length="middle" rot="R180"/>
+<pin name="PA8" x="40.64" y="-17.78" length="middle" rot="R180"/>
+<pin name="USART1_TX/I2C1_SCL/PA9" x="40.64" y="-15.24" length="middle" rot="R180"/>
+<pin name="USART1_RX/I2C1_SDA/PA10" x="40.64" y="-12.7" length="middle" rot="R180"/>
+<pin name="CAN_RX/I2C1_SCL/USB_DM/PA11" x="40.64" y="-10.16" length="middle" rot="R180"/>
+<pin name="CAN_TX/I2C1_SDA/USB_DP/PA12" x="40.64" y="-7.62" length="middle" rot="R180"/>
+<pin name="SWDIO/PA13" x="40.64" y="-5.08" length="middle" rot="R180"/>
+<pin name="USART2_TX/SWCLK/PA14" x="40.64" y="-2.54" length="middle" rot="R180"/>
+<pin name="USART2_RX/PA15" x="40.64" y="0" length="middle" rot="R180"/>
+<pin name="SPI1_SCK/PB3" x="40.64" y="2.54" length="middle" rot="R180"/>
+<pin name="SPI1_MISO/PB4" x="40.64" y="5.08" length="middle" rot="R180"/>
+<pin name="SPI1_MOSI/PB5" x="40.64" y="7.62" length="middle" rot="R180"/>
+<pin name="I2C1_SCL/USART1_TX/PB6" x="40.64" y="10.16" length="middle" rot="R180"/>
+<pin name="I2C1_SDA/USART1_RX/PB7" x="40.64" y="12.7" length="middle" rot="R180"/>
+<pin name="BOOT0/I2C1_SCL/CAN_RX/PB8" x="40.64" y="17.78" length="middle" rot="R180"/>
+<wire x1="-40.64" y1="22.86" x2="-40.64" y2="-25.4" width="0.254" layer="94"/>
+<pin name="GND" x="-5.08" y="-30.48" length="middle" rot="R90"/>
+</symbol>
+<symbol name="POGOPROG-CONN-4">
+<pin name="SWDIO" x="-2.54" y="-2.54" length="short"/>
+<pin name="SWCLK" x="-2.54" y="0" length="short"/>
 <pin name="VCC" x="-2.54" y="5.08" length="short"/>
 <pin name="GND" x="-2.54" y="2.54" length="short"/>
 <text x="0" y="7.62" size="1.778" layer="95">&gt;NAME</text>
-<text x="0" y="-10.16" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
-<rectangle x1="0" y1="-8.89" x2="1.27" y2="6.35" layer="94"/>
+<text x="0" y="-5.08" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
+<rectangle x1="0" y1="-3.81" x2="1.27" y2="6.35" layer="94"/>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="STM32F042K">
-<gates>
-<gate name="G$1" symbol="STM32F042K" x="2.54" y="0"/>
-</gates>
-<devices>
-<device name="" package="UFQFPN32">
-<connects>
-<connect gate="G$1" pin="BOOT0-PF11" pad="31"/>
-<connect gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11" pad="21"/>
-<connect gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12" pad="22"/>
-<connect gate="G$1" pin="GND" pad="EXP"/>
-<connect gate="G$1" pin="I2C1_SCL/CAN_RX/PB8" pad="32"/>
-<connect gate="G$1" pin="I2C1_SCL/USART1_TX/PB6" pad="29"/>
-<connect gate="G$1" pin="I2C1_SDA/USART1_RX/PB7" pad="30"/>
-<connect gate="G$1" pin="NRST" pad="4"/>
-<connect gate="G$1" pin="PA0/ADC0" pad="6"/>
-<connect gate="G$1" pin="PA1/ADC1" pad="7"/>
-<connect gate="G$1" pin="PA2/ADC2/USART2_TX" pad="8"/>
-<connect gate="G$1" pin="PA3/ADC3/USART2_RX" pad="9"/>
-<connect gate="G$1" pin="PA4/ADC4" pad="10"/>
-<connect gate="G$1" pin="PA5/ADC5/SPI1_SCK" pad="11"/>
-<connect gate="G$1" pin="PA6/ADC6/SPI1_MISO" pad="12"/>
-<connect gate="G$1" pin="PA7/ADC7/SPI1_MOSI" pad="13"/>
-<connect gate="G$1" pin="PA8" pad="18"/>
-<connect gate="G$1" pin="PB0/ADC8" pad="14"/>
-<connect gate="G$1" pin="PB1/ADC9" pad="15"/>
-<connect gate="G$1" pin="PB2" pad="16"/>
-<connect gate="G$1" pin="PF0/I2C1_SDA" pad="2"/>
-<connect gate="G$1" pin="PF1/I2C1_SCL" pad="3"/>
-<connect gate="G$1" pin="SPI1_MISO/PB4" pad="27"/>
-<connect gate="G$1" pin="SPI1_MOSI/PB5" pad="28"/>
-<connect gate="G$1" pin="SPI1_SCK/PB3" pad="26"/>
-<connect gate="G$1" pin="SWDIO/PA13" pad="23"/>
-<connect gate="G$1" pin="USART1_RX/I2C1_SDA/PA10" pad="20"/>
-<connect gate="G$1" pin="USART1_TX/I2C1_SCL/PA9" pad="19"/>
-<connect gate="G$1" pin="USART2_RX/PA15" pad="25"/>
-<connect gate="G$1" pin="USART2_TX/SWCLK/PA14" pad="24"/>
-<connect gate="G$1" pin="VDD" pad="1"/>
-<connect gate="G$1" pin="VDDA" pad="5"/>
-<connect gate="G$1" pin="VDDIO2" pad="17"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-<deviceset name="CAP-ARRAY">
+<deviceset name="CAP-ARRAY" prefix="CA">
 <gates>
 <gate name="1" symbol="C" x="-12.7" y="0"/>
 <gate name="2" symbol="C" x="-2.54" y="0"/>
@@ -2738,98 +2545,62 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="POGOPIN-CONN">
-<description>Protofusion custom pogo pin programming header</description>
+<deviceset name="STM32F042K-T" prefix="U">
 <gates>
-<gate name="J" symbol="POGOPROG-CONN" x="0" y="0"/>
+<gate name="G$1" symbol="STM32F042K-T" x="5.08" y="0"/>
 </gates>
 <devices>
-<device name="STANDARD" package="POGOPROG-CONN">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="WITHVIAS" package="POGOPROG-CONN-0H">
+<device name="" package="LQFP32">
 <connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="ONEHOLE" package="POGOPROG-CONN-1H">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
+<connect gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8" pad="31"/>
+<connect gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11" pad="21"/>
+<connect gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12" pad="22"/>
+<connect gate="G$1" pin="GND" pad="16 32"/>
+<connect gate="G$1" pin="I2C1_SCL/USART1_TX/PB6" pad="29"/>
+<connect gate="G$1" pin="I2C1_SDA/USART1_RX/PB7" pad="30"/>
+<connect gate="G$1" pin="NRST" pad="4"/>
+<connect gate="G$1" pin="PA0/ADC0" pad="6"/>
+<connect gate="G$1" pin="PA1/ADC1" pad="7"/>
+<connect gate="G$1" pin="PA2/ADC2/USART2_TX" pad="8"/>
+<connect gate="G$1" pin="PA3/ADC3/USART2_RX" pad="9"/>
+<connect gate="G$1" pin="PA4/ADC4" pad="10"/>
+<connect gate="G$1" pin="PA5/ADC5/SPI1_SCK" pad="11"/>
+<connect gate="G$1" pin="PA6/ADC6/SPI1_MISO" pad="12"/>
+<connect gate="G$1" pin="PA7/ADC7/SPI1_MOSI" pad="13"/>
+<connect gate="G$1" pin="PA8" pad="18"/>
+<connect gate="G$1" pin="PB0/ADC8" pad="14"/>
+<connect gate="G$1" pin="PB1/ADC9" pad="15"/>
+<connect gate="G$1" pin="PF0/I2C1_SDA" pad="2"/>
+<connect gate="G$1" pin="PF1/I2C1_SCL" pad="3"/>
+<connect gate="G$1" pin="SPI1_MISO/PB4" pad="27"/>
+<connect gate="G$1" pin="SPI1_MOSI/PB5" pad="28"/>
+<connect gate="G$1" pin="SPI1_SCK/PB3" pad="26"/>
+<connect gate="G$1" pin="SWDIO/PA13" pad="23"/>
+<connect gate="G$1" pin="USART1_RX/I2C1_SDA/PA10" pad="20"/>
+<connect gate="G$1" pin="USART1_TX/I2C1_SCL/PA9" pad="19"/>
+<connect gate="G$1" pin="USART2_RX/PA15" pad="25"/>
+<connect gate="G$1" pin="USART2_TX/SWCLK/PA14" pad="24"/>
+<connect gate="G$1" pin="VDD" pad="1"/>
+<connect gate="G$1" pin="VDDA" pad="5"/>
+<connect gate="G$1" pin="VDDIO2" pad="17"/>
 </connects>
 <technologies>
 <technology name=""/>
 </technologies>
 </device>
-<device name="WITHVIAS-SMV" package="POGOPROG-CONN-OH-SMALLERVIAS">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="WIDE" package="POGOPROG-CONN-W">
+</devices>
+</deviceset>
+<deviceset name="POGOPIN-CONN-4" prefix="J">
+<gates>
+<gate name="G$1" symbol="POGOPROG-CONN-4" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="POGOPROG-CONN-4-ALLSMT">
 <connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="WITHVIAS-1V" package="POGOPROG-CONN-OH-1V">
-<connects>
-<connect gate="J" pin="GND" pad="5"/>
-<connect gate="J" pin="MISO" pad="3"/>
-<connect gate="J" pin="MOSI" pad="2"/>
-<connect gate="J" pin="SCK" pad="4"/>
-<connect gate="J" pin="VCC" pad="6"/>
-<connect gate="J" pin="\RST" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="ALLSMT" package="POGOPROG-CONN-ALLSMT">
-<connects>
-<connect gate="J" pin="GND" pad="2"/>
-<connect gate="J" pin="MISO" pad="4"/>
-<connect gate="J" pin="MOSI" pad="5"/>
-<connect gate="J" pin="SCK" pad="3"/>
-<connect gate="J" pin="VCC" pad="1"/>
-<connect gate="J" pin="\RST" pad="6"/>
+<connect gate="G$1" pin="GND" pad="2"/>
+<connect gate="G$1" pin="SWCLK" pad="3"/>
+<connect gate="G$1" pin="SWDIO" pad="4"/>
+<connect gate="G$1" pin="VCC" pad="1"/>
 </connects>
 <technologies>
 <technology name=""/>
@@ -4060,58 +3831,62 @@ Standard 0603 ceramic capacitor, and 0.1
 </class>
 </classes>
 <parts>
-<part name="U$2" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$17" library="microbuilder" deviceset="3.3V" device=""/>
+<part name="SUP3" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP4" library="microbuilder" deviceset="3.3V" device=""/>
 <part name="SW1" library="dp_devices" deviceset="JOYSTICK_SF303GJ26-3" device=""/>
-<part name="J2" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
-<part name="U3" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
-<part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2202K-3.3TRG1"/>
+<part name="JP1" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
+<part name="IC1" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
+<part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2210K-3.3"/>
 <part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603"/>
 <part name="JP2" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="JP3" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="JP4" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
-<part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUPPLY9" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
+<part name="GND5" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="U$4" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$5" library="microbuilder" deviceset="GND" device=""/>
+<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUP8" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP11" library="microbuilder" deviceset="GND" device=""/>
 <part name="D1" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
-<part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
+<part name="SUPPLY7" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
+<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="4.7uF"/>
 <part name="C7" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
 <part name="R1" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
-<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND6" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUP12" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY10" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="C10" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="GND4" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="U$10" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY9" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="C8" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
-<part name="GND7" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="GND8" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
 <part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND" value="SSD1306-SPI"/>
-<part name="U1" library="Protofusion" deviceset="STM32F042K" device=""/>
 <part name="C2" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C1" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C6" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
-<part name="U$14" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$15" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$16" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$18" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY11" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="SUPPLY12" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="SUPPLY13" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="RA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
-<part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
-<part name="J1" library="Protofusion" deviceset="POGOPIN-CONN" device="ALLSMT"/>
-<part name="U$7" library="microbuilder" deviceset="GND" device=""/>
-<part name="C9" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
-<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="390k"/>
+<part name="SUP1" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP2" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP7" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP5" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="CA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
+<part name="SUP6" library="microbuilder" deviceset="GND" device=""/>
+<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
+<part name="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="390k"/>
 <part name="C3" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
-<part name="U$1" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
+<part name="SUP9" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY8" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="C9" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
+<part name="U1" library="Protofusion" deviceset="STM32F042K-T" device=""/>
+<part name="J1" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
+<part name="SUPPLY6" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
+<part name="SUP10" library="microbuilder" deviceset="GND" device=""/>
+<part name="C8" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="JP5" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 </parts>
 <sheets>
 <sheet>
@@ -4122,65 +3897,75 @@ Standard 0603 ceramic capacitor, and 0.1
 <text x="58.42" y="83.82" size="2.54" layer="113">OLED Display</text>
 <text x="15.24" y="83.82" size="2.54" layer="113">Indication</text>
 <text x="139.7" y="43.18" size="2.54" layer="113">Buttons</text>
-<text x="228.6" y="175.26" size="2.54" layer="113">TC Amp</text>
+<text x="215.9" y="177.8" size="2.54" layer="113">TC Amp</text>
 <text x="101.6" y="172.72" size="2.54" layer="113">Micro</text>
 </plain>
 <instances>
-<instance part="U$2" gate="G$1" x="48.26" y="30.48"/>
-<instance part="U$17" gate="G$1" x="99.06" y="66.04"/>
+<instance part="SUP3" gate="G$1" x="48.26" y="30.48"/>
+<instance part="SUP4" gate="G$1" x="99.06" y="66.04"/>
 <instance part="SW1" gate="SW" x="147.32" y="30.48"/>
-<instance part="J2" gate="G$1" x="256.54" y="35.56"/>
-<instance part="U3" gate="G$1" x="205.74" y="160.02" rot="R180"/>
+<instance part="JP1" gate="G$1" x="256.54" y="35.56"/>
+<instance part="IC1" gate="G$1" x="205.74" y="160.02" rot="R180"/>
 <instance part="U2" gate="G$1" x="149.86" y="66.04"/>
 <instance part="LED1" gate="G$1" x="27.94" y="48.26"/>
 <instance part="JP2" gate="G$1" x="261.62" y="129.54" rot="R180"/>
 <instance part="JP3" gate="G$1" x="261.62" y="114.3" rot="R180"/>
 <instance part="JP4" gate="G$1" x="261.62" y="99.06" rot="R180"/>
-<instance part="SUPPLY1" gate="G$1" x="228.6" y="132.08"/>
-<instance part="GND1" gate="1" x="228.6" y="121.92"/>
+<instance part="SUPPLY9" gate="G$1" x="246.38" y="132.08"/>
+<instance part="GND5" gate="1" x="246.38" y="121.92"/>
 <instance part="SUPPLY3" gate="G$1" x="134.62" y="73.66"/>
-<instance part="GND2" gate="1" x="134.62" y="55.88"/>
-<instance part="SUPPLY4" gate="G$1" x="177.8" y="73.66"/>
-<instance part="U$4" gate="G$1" x="170.18" y="25.4"/>
-<instance part="U$5" gate="G$1" x="251.46" y="33.02"/>
+<instance part="GND3" gate="1" x="134.62" y="55.88"/>
+<instance part="SUPPLY5" gate="G$1" x="177.8" y="73.66"/>
+<instance part="SUP8" gate="G$1" x="170.18" y="25.4"/>
+<instance part="SUP11" gate="G$1" x="251.46" y="33.02"/>
 <instance part="D1" gate="G$1" x="231.14" y="38.1" rot="R180"/>
-<instance part="SUPPLY5" gate="G$1" x="218.44" y="40.64"/>
+<instance part="SUPPLY7" gate="G$1" x="218.44" y="40.64"/>
 <instance part="C5" gate="G$1" x="121.92" y="68.58" rot="R180"/>
 <instance part="C7" gate="G$1" x="182.88" y="63.5"/>
 <instance part="R1" gate="G$1" x="27.94" y="58.42" rot="R270"/>
-<instance part="GND3" gate="1" x="228.6" y="106.68"/>
-<instance part="GND4" gate="1" x="27.94" y="38.1"/>
-<instance part="U$10" gate="G$1" x="269.24" y="152.4"/>
-<instance part="SUPPLY9" gate="G$1" x="269.24" y="167.64"/>
-<instance part="C8" gate="G$1" x="269.24" y="162.56" rot="R180"/>
-<instance part="GND7" gate="1" x="121.92" y="58.42"/>
-<instance part="GND8" gate="1" x="182.88" y="55.88"/>
+<instance part="GND6" gate="1" x="246.38" y="106.68"/>
+<instance part="GND1" gate="1" x="27.94" y="38.1"/>
+<instance part="SUP12" gate="G$1" x="269.24" y="152.4"/>
+<instance part="SUPPLY10" gate="G$1" x="269.24" y="167.64"/>
+<instance part="C10" gate="G$1" x="269.24" y="162.56" rot="R180"/>
+<instance part="GND2" gate="1" x="121.92" y="58.42"/>
+<instance part="GND4" gate="1" x="182.88" y="55.88"/>
 <instance part="FRAME1" gate="G$1" x="5.08" y="5.08"/>
 <instance part="LCD1" gate="G$1" x="86.36" y="53.34"/>
-<instance part="U1" gate="G$1" x="106.68" y="124.46"/>
-<instance part="C2" gate="G$1" x="33.02" y="144.78"/>
-<instance part="C1" gate="G$1" x="20.32" y="152.4"/>
-<instance part="C6" gate="G$1" x="160.02" y="116.84"/>
-<instance part="U$14" gate="G$1" x="20.32" y="137.16"/>
-<instance part="U$15" gate="G$1" x="33.02" y="137.16"/>
-<instance part="U$16" gate="G$1" x="160.02" y="109.22"/>
-<instance part="U$18" gate="G$1" x="106.68" y="109.22"/>
-<instance part="SUPPLY11" gate="G$1" x="20.32" y="165.1"/>
-<instance part="SUPPLY12" gate="G$1" x="33.02" y="154.94"/>
-<instance part="SUPPLY13" gate="G$1" x="160.02" y="124.46"/>
-<instance part="RA1" gate="1" x="68.58" y="60.96" rot="R90"/>
-<instance part="RA1" gate="2" x="63.5" y="55.88" rot="R90"/>
-<instance part="RA1" gate="3" x="68.58" y="38.1" rot="R90"/>
-<instance part="RA1" gate="4" x="63.5" y="35.56" rot="R90"/>
-<instance part="JP1" gate="G$1" x="261.62" y="83.82" rot="R180"/>
-<instance part="J1" gate="J" x="261.62" y="63.5"/>
-<instance part="U$7" gate="G$1" x="175.26" y="154.94"/>
-<instance part="C9" gate="G$1" x="71.12" y="71.12" rot="R90"/>
-<instance part="R3" gate="G$1" x="55.88" y="40.64"/>
+<instance part="C2" gate="G$1" x="40.64" y="144.78"/>
+<instance part="C1" gate="G$1" x="27.94" y="152.4"/>
+<instance part="C6" gate="G$1" x="170.18" y="116.84"/>
+<instance part="SUP1" gate="G$1" x="27.94" y="137.16"/>
+<instance part="SUP2" gate="G$1" x="40.64" y="137.16"/>
+<instance part="SUP7" gate="G$1" x="170.18" y="109.22"/>
+<instance part="SUP5" gate="G$1" x="106.68" y="109.22"/>
+<instance part="SUPPLY1" gate="G$1" x="27.94" y="165.1"/>
+<instance part="SUPPLY2" gate="G$1" x="40.64" y="154.94"/>
+<instance part="SUPPLY4" gate="G$1" x="170.18" y="127"/>
+<instance part="CA1" gate="1" x="68.58" y="60.96" rot="R90"/>
+<instance part="CA1" gate="2" x="63.5" y="55.88" rot="R90"/>
+<instance part="CA1" gate="3" x="68.58" y="38.1" rot="R90"/>
+<instance part="CA1" gate="4" x="63.5" y="35.56" rot="R90"/>
+<instance part="SUP6" gate="G$1" x="165.1" y="157.48"/>
+<instance part="C4" gate="G$1" x="71.12" y="71.12" rot="R90"/>
+<instance part="R2" gate="G$1" x="55.88" y="40.64"/>
 <instance part="C3" gate="G$1" x="60.96" y="66.04" rot="R270"/>
-<instance part="U$1" gate="G$1" x="223.52" y="152.4"/>
-<instance part="SUPPLY2" gate="G$1" x="223.52" y="167.64"/>
-<instance part="C4" gate="G$1" x="251.46" y="162.56" rot="R180"/>
+<instance part="SUP9" gate="G$1" x="223.52" y="152.4"/>
+<instance part="SUPPLY8" gate="G$1" x="223.52" y="167.64"/>
+<instance part="C9" gate="G$1" x="251.46" y="162.56" rot="R180"/>
+<instance part="U1" gate="G$1" x="111.76" y="144.78"/>
+<instance part="J1" gate="G$1" x="223.52" y="60.96"/>
+<instance part="SUPPLY6" gate="G$1" x="215.9" y="68.58"/>
+<instance part="R3" gate="G$1" x="246.38" y="76.2" smashed="yes" rot="R270">
+<attribute name="NAME" x="248.412" y="76.9366" size="1.778" layer="95"/>
+<attribute name="VALUE" x="243.078" y="80.01" size="1.778" layer="96" rot="R270"/>
+</instance>
+<instance part="SUP10" gate="G$1" x="246.38" y="60.96"/>
+<instance part="C8" gate="G$1" x="241.3" y="73.66" smashed="yes">
+<attribute name="NAME" x="240.284" y="78.359" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="240.538" y="73.279" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="JP5" gate="G$1" x="261.62" y="86.36" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -4191,14 +3976,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="55.88" y1="68.58" x2="55.88" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="55.88" y1="71.12" x2="66.04" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="C2-"/>
-<pinref part="C9" gate="G$1" pin="1"/>
+<pinref part="C4" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <wire x1="73.66" y1="71.12" x2="76.2" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="C2+"/>
-<pinref part="C9" gate="G$1" pin="2"/>
+<pinref part="C4" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$3" class="0">
@@ -4236,120 +4021,130 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="48.26" y="40.64"/>
 <junction x="48.26" y="35.56"/>
 <junction x="48.26" y="38.1"/>
-<pinref part="U$2" gate="G$1" pin="GND"/>
+<pinref part="SUP3" gate="G$1" pin="GND"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
-<pinref part="RA1" gate="1" pin="1"/>
-<pinref part="RA1" gate="2" pin="1"/>
-<pinref part="RA1" gate="3" pin="1"/>
-<pinref part="RA1" gate="4" pin="1"/>
-<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="CA1" gate="1" pin="1"/>
+<pinref part="CA1" gate="2" pin="1"/>
+<pinref part="CA1" gate="3" pin="1"/>
+<pinref part="CA1" gate="4" pin="1"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="JP2" gate="G$1" pin="2"/>
-<pinref part="GND1" gate="1" pin="GND"/>
-<wire x1="254" y1="127" x2="228.6" y2="127" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="127" x2="228.6" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="GND5" gate="1" pin="GND"/>
+<wire x1="254" y1="127" x2="246.38" y2="127" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="127" x2="246.38" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="GND"/>
 <wire x1="139.7" y1="66.04" x2="134.62" y2="66.04" width="0.1524" layer="91"/>
 <wire x1="134.62" y1="66.04" x2="134.62" y2="58.42" width="0.1524" layer="91"/>
-<pinref part="GND2" gate="1" pin="GND"/>
+<pinref part="GND3" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="SW1" gate="SW" pin="COMMON"/>
-<pinref part="U$4" gate="G$1" pin="GND"/>
+<pinref part="SUP8" gate="G$1" pin="GND"/>
 <wire x1="154.94" y1="30.48" x2="170.18" y2="30.48" width="0.1524" layer="91"/>
 <wire x1="170.18" y1="30.48" x2="170.18" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="J2" gate="G$1" pin="GND"/>
-<pinref part="U$5" gate="G$1" pin="GND"/>
+<pinref part="JP1" gate="G$1" pin="GND"/>
+<pinref part="SUP11" gate="G$1" pin="GND"/>
 <wire x1="251.46" y1="35.56" x2="254" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="JP3" gate="G$1" pin="2"/>
-<wire x1="254" y1="111.76" x2="228.6" y2="111.76" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="111.76" x2="228.6" y2="109.22" width="0.1524" layer="91"/>
-<pinref part="GND3" gate="1" pin="GND"/>
+<wire x1="254" y1="111.76" x2="246.38" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="111.76" x2="246.38" y2="109.22" width="0.1524" layer="91"/>
+<pinref part="GND6" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="LED1" gate="G$1" pin="C"/>
-<pinref part="GND4" gate="1" pin="GND"/>
+<pinref part="GND1" gate="1" pin="GND"/>
 <wire x1="27.94" y1="43.18" x2="27.94" y2="40.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C8" gate="G$1" pin="1"/>
-<pinref part="U$10" gate="G$1" pin="GND"/>
+<pinref part="C10" gate="G$1" pin="1"/>
+<pinref part="SUP12" gate="G$1" pin="GND"/>
 <wire x1="269.24" y1="157.48" x2="269.24" y2="154.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="1"/>
-<pinref part="GND7" gate="1" pin="GND"/>
+<pinref part="GND2" gate="1" pin="GND"/>
 <wire x1="121.92" y1="60.96" x2="121.92" y2="63.5" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C7" gate="G$1" pin="2"/>
-<pinref part="GND8" gate="1" pin="GND"/>
+<pinref part="GND4" gate="1" pin="GND"/>
 <wire x1="182.88" y1="58.42" x2="182.88" y2="60.96" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
-<wire x1="20.32" y1="149.86" x2="20.32" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$14" gate="G$1" pin="GND"/>
+<wire x1="27.94" y1="149.86" x2="27.94" y2="139.7" width="0.1524" layer="91"/>
+<pinref part="SUP1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="2"/>
-<wire x1="33.02" y1="142.24" x2="33.02" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$15" gate="G$1" pin="GND"/>
+<wire x1="40.64" y1="142.24" x2="40.64" y2="139.7" width="0.1524" layer="91"/>
+<pinref part="SUP2" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="2"/>
-<wire x1="160.02" y1="114.3" x2="160.02" y2="111.76" width="0.1524" layer="91"/>
-<pinref part="U$16" gate="G$1" pin="GND"/>
+<wire x1="170.18" y1="114.3" x2="170.18" y2="111.76" width="0.1524" layer="91"/>
+<pinref part="SUP7" gate="G$1" pin="GND"/>
 </segment>
 <segment>
+<pinref part="SUP5" gate="G$1" pin="GND"/>
+<wire x1="106.68" y1="111.76" x2="106.68" y2="114.3" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="GND"/>
-<pinref part="U$18" gate="G$1" pin="GND"/>
-<wire x1="106.68" y1="111.76" x2="106.68" y2="114.3" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<wire x1="152.4" y1="162.56" x2="165.1" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="165.1" y1="162.56" x2="165.1" y2="160.02" width="0.1524" layer="91"/>
+<pinref part="SUP6" gate="G$1" pin="GND"/>
+<pinref part="U1" gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 <segment>
-<pinref part="J1" gate="J" pin="GND"/>
-<wire x1="254" y1="66.04" x2="259.08" y2="66.04" width="0.1524" layer="91"/>
-<label x="254" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="IC1" gate="G$1" pin="GND"/>
+<wire x1="223.52" y1="157.48" x2="220.98" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="157.48" x2="223.52" y2="154.94" width="0.1524" layer="91"/>
+<pinref part="SUP9" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="BOOT0-PF11"/>
-<wire x1="152.4" y1="160.02" x2="175.26" y2="160.02" width="0.1524" layer="91"/>
-<wire x1="175.26" y1="160.02" x2="175.26" y2="157.48" width="0.1524" layer="91"/>
-<pinref part="U$7" gate="G$1" pin="GND"/>
+<wire x1="215.9" y1="63.5" x2="220.98" y2="63.5" width="0.1524" layer="91"/>
+<label x="215.9" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="GND"/>
-<wire x1="223.52" y1="157.48" x2="220.98" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="223.52" y1="157.48" x2="223.52" y2="154.94" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="GND"/>
+<pinref part="R3" gate="G$1" pin="2"/>
+<wire x1="246.38" y1="71.12" x2="246.38" y2="68.58" width="0.1524" layer="91"/>
+<pinref part="SUP10" gate="G$1" pin="GND"/>
+<wire x1="246.38" y1="68.58" x2="246.38" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="68.58" x2="241.3" y2="68.58" width="0.1524" layer="91"/>
+<junction x="246.38" y="68.58"/>
+<pinref part="C8" gate="G$1" pin="2"/>
+<wire x1="241.3" y1="68.58" x2="241.3" y2="71.12" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$8" class="0">
 <segment>
 <wire x1="76.2" y1="40.64" x2="60.96" y2="40.64" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="IREF"/>
-<pinref part="R3" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$9" class="0">
 <segment>
 <wire x1="76.2" y1="38.1" x2="71.12" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCOMH"/>
-<pinref part="RA1" gate="3" pin="2"/>
+<pinref part="CA1" gate="3" pin="2"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
 <wire x1="76.2" y1="35.56" x2="66.04" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCC"/>
-<pinref part="RA1" gate="4" pin="2"/>
+<pinref part="CA1" gate="4" pin="2"/>
 </segment>
 </net>
 <net name="3.3V" class="0">
@@ -4361,68 +4156,75 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="76.2" y1="55.88" x2="99.06" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="55.88" x2="99.06" y2="60.96" width="0.1524" layer="91"/>
 <junction x="99.06" y="60.96"/>
-<pinref part="U$17" gate="G$1" pin="3.3V"/>
+<pinref part="SUP4" gate="G$1" pin="3.3V"/>
 <pinref part="LCD1" gate="G$1" pin="VBAT"/>
 <junction x="76.2" y="60.96"/>
 <pinref part="LCD1" gate="G$1" pin="VDD"/>
 <junction x="76.2" y="55.88"/>
-<pinref part="RA1" gate="1" pin="2"/>
-<pinref part="RA1" gate="2" pin="2"/>
+<pinref part="CA1" gate="1" pin="2"/>
+<pinref part="CA1" gate="2" pin="2"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="OUT"/>
 <wire x1="157.48" y1="71.12" x2="177.8" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="177.8" y1="71.12" x2="177.8" y2="73.66" width="0.1524" layer="91"/>
-<pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY5" gate="G$1" pin="3.3V"/>
 <pinref part="C7" gate="G$1" pin="1"/>
 <wire x1="177.8" y1="71.12" x2="182.88" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="182.88" y1="71.12" x2="182.88" y2="68.58" width="0.1524" layer="91"/>
 <junction x="177.8" y="71.12"/>
 </segment>
 <segment>
-<pinref part="C8" gate="G$1" pin="2"/>
-<pinref part="SUPPLY9" gate="G$1" pin="3.3V"/>
+<pinref part="C10" gate="G$1" pin="2"/>
+<pinref part="SUPPLY10" gate="G$1" pin="3.3V"/>
 <wire x1="269.24" y1="165.1" x2="269.24" y2="167.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
+<pinref part="C1" gate="G$1" pin="1"/>
+<wire x1="66.04" y1="162.56" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="162.56" x2="27.94" y2="157.48" width="0.1524" layer="91"/>
+<pinref part="SUPPLY1" gate="G$1" pin="3.3V"/>
+<wire x1="27.94" y1="165.1" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
+<junction x="27.94" y="162.56"/>
 <pinref part="U1" gate="G$1" pin="VDD"/>
-<pinref part="C1" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="162.56" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
-<wire x1="20.32" y1="162.56" x2="20.32" y2="157.48" width="0.1524" layer="91"/>
-<pinref part="SUPPLY11" gate="G$1" pin="3.3V"/>
-<wire x1="20.32" y1="165.1" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
-<junction x="20.32" y="162.56"/>
+</segment>
+<segment>
+<pinref part="C2" gate="G$1" pin="1"/>
+<wire x1="66.04" y1="152.4" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="152.4" x2="40.64" y2="149.86" width="0.1524" layer="91"/>
+<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
+<wire x1="40.64" y1="154.94" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
+<junction x="40.64" y="152.4"/>
+<pinref part="U1" gate="G$1" pin="VDDA"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="VDDA"/>
-<pinref part="C2" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="152.4" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
-<wire x1="33.02" y1="152.4" x2="33.02" y2="149.86" width="0.1524" layer="91"/>
-<pinref part="SUPPLY12" gate="G$1" pin="3.3V"/>
-<wire x1="33.02" y1="154.94" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
-<junction x="33.02" y="152.4"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<wire x1="170.18" y1="127" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
+<pinref part="U1" gate="G$1" pin="VDDIO2"/>
+<wire x1="170.18" y1="124.46" x2="170.18" y2="121.92" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="124.46" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
+<junction x="170.18" y="124.46"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="VDDIO2"/>
-<pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="152.4" y1="124.46" x2="160.02" y2="124.46" width="0.1524" layer="91"/>
-<wire x1="160.02" y1="124.46" x2="160.02" y2="121.92" width="0.1524" layer="91"/>
-<pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
-<junction x="160.02" y="124.46"/>
+<pinref part="IC1" gate="G$1" pin="VCC"/>
+<wire x1="223.52" y1="165.1" x2="223.52" y2="167.64" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="165.1" x2="220.98" y2="165.1" width="0.1524" layer="91"/>
+<pinref part="SUPPLY8" gate="G$1" pin="3.3V"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="VCC"/>
-<wire x1="223.52" y1="165.1" x2="223.52" y2="167.64" width="0.1524" layer="91"/>
-<wire x1="223.52" y1="165.1" x2="220.98" y2="165.1" width="0.1524" layer="91"/>
-<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
+<pinref part="J1" gate="G$1" pin="VCC"/>
+<pinref part="SUPPLY6" gate="G$1" pin="3.3V"/>
+<wire x1="220.98" y1="66.04" x2="215.9" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="215.9" y1="66.04" x2="215.9" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="V_BATT" class="0">
 <segment>
 <pinref part="JP2" gate="G$1" pin="1"/>
-<pinref part="SUPPLY1" gate="G$1" pin="V_BATT"/>
-<wire x1="254" y1="129.54" x2="228.6" y2="129.54" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="129.54" x2="228.6" y2="132.08" width="0.1524" layer="91"/>
+<pinref part="SUPPLY9" gate="G$1" pin="V_BATT"/>
+<wire x1="254" y1="129.54" x2="246.38" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="129.54" x2="246.38" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="EN"/>
@@ -4442,18 +4244,18 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="D1" gate="G$1" pin="C"/>
 <wire x1="228.6" y1="38.1" x2="218.44" y2="38.1" width="0.1524" layer="91"/>
 <wire x1="218.44" y1="38.1" x2="218.44" y2="40.64" width="0.1524" layer="91"/>
-<pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
+<pinref part="SUPPLY7" gate="G$1" pin="V_BATT"/>
 </segment>
 </net>
 <net name="SW-A" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="A"/>
 <wire x1="129.54" y1="33.02" x2="139.7" y2="33.02" width="0.1524" layer="91"/>
-<label x="129.54" y="33.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="152.4" x2="152.4" y2="152.4" width="0.1524" layer="91"/>
-<label x="154.94" y="152.4" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="152.4" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_MOSI/PB5"/>
 </segment>
 </net>
@@ -4461,11 +4263,11 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="C"/>
 <wire x1="129.54" y1="27.94" x2="139.7" y2="27.94" width="0.1524" layer="91"/>
-<label x="129.54" y="27.94" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="27.94" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="147.32" x2="152.4" y2="147.32" width="0.1524" layer="91"/>
-<label x="154.94" y="147.32" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="147.32" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_SCK/PB3"/>
 </segment>
 </net>
@@ -4473,11 +4275,11 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="B"/>
 <wire x1="162.56" y1="33.02" x2="154.94" y2="33.02" width="0.1524" layer="91"/>
-<label x="162.56" y="33.02" size="1.016" layer="95" xref="yes"/>
+<label x="162.56" y="33.02" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="157.48" x2="152.4" y2="157.48" width="0.1524" layer="91"/>
-<label x="154.94" y="157.48" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="157.48" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
 </segment>
 </net>
@@ -4485,51 +4287,41 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="D"/>
 <wire x1="162.56" y1="27.94" x2="154.94" y2="27.94" width="0.1524" layer="91"/>
-<label x="162.56" y="27.94" size="1.016" layer="95" xref="yes"/>
+<label x="162.56" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="154.94" x2="152.4" y2="154.94" width="0.1524" layer="91"/>
-<label x="154.94" y="154.94" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="154.94" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D+"/>
+<pinref part="JP1" gate="G$1" pin="D+"/>
 <wire x1="248.92" y1="43.18" x2="254" y2="43.18" width="0.1524" layer="91"/>
-<label x="248.92" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="248.92" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="137.16" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="137.16" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="137.16" x2="154.94" y2="137.16" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
-<wire x1="152.4" y1="137.16" x2="182.88" y2="137.16" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<pinref part="J1" gate="J" pin="MOSI"/>
-<wire x1="254" y1="58.42" x2="259.08" y2="58.42" width="0.1524" layer="91"/>
-<label x="254" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D-"/>
+<pinref part="JP1" gate="G$1" pin="D-"/>
 <wire x1="248.92" y1="40.64" x2="254" y2="40.64" width="0.1524" layer="91"/>
-<label x="248.92" y="40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="248.92" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="134.62" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="134.62" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="134.62" x2="154.94" y2="134.62" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
-<wire x1="152.4" y1="134.62" x2="182.88" y2="134.62" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<pinref part="J1" gate="J" pin="\RST"/>
-<wire x1="254" y1="55.88" x2="259.08" y2="55.88" width="0.1524" layer="91"/>
-<label x="254" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="VUSB" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="VBUS"/>
+<pinref part="JP1" gate="G$1" pin="VBUS"/>
 <pinref part="D1" gate="G$1" pin="A"/>
 <wire x1="233.68" y1="38.1" x2="238.76" y2="38.1" width="0.1524" layer="91"/>
 <wire x1="238.76" y1="38.1" x2="254" y2="38.1" width="0.1524" layer="91"/>
@@ -4538,21 +4330,16 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="238.76" y1="43.18" x2="236.22" y2="43.18" width="0.1524" layer="91"/>
 <label x="236.22" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
-<segment>
-<pinref part="J1" gate="J" pin="VCC"/>
-<wire x1="259.08" y1="68.58" x2="254" y2="68.58" width="0.1524" layer="91"/>
-<label x="254" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
 </net>
 <net name="SSR+" class="0">
 <segment>
 <pinref part="JP3" gate="G$1" pin="1"/>
-<wire x1="254" y1="114.3" x2="228.6" y2="114.3" width="0.1524" layer="91"/>
-<label x="228.6" y="114.3" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="114.3" x2="246.38" y2="114.3" width="0.1524" layer="91"/>
+<label x="246.38" y="114.3" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="60.96" y="147.32" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="60.96" y1="147.32" x2="66.04" y2="147.32" width="0.1524" layer="91"/>
+<label x="63.5" y="147.32" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="147.32" x2="66.04" y2="147.32" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA1/ADC1"/>
 </segment>
 </net>
@@ -4570,48 +4357,48 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="27.94" y="66.04" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
-<wire x1="154.94" y1="162.56" x2="152.4" y2="162.56" width="0.1524" layer="91"/>
-<label x="154.94" y="162.56" size="1.016" layer="95" xref="yes"/>
-<pinref part="U1" gate="G$1" pin="I2C1_SCL/CAN_RX/PB8"/>
+<wire x1="63.5" y1="160.02" x2="66.04" y2="160.02" width="0.1524" layer="91"/>
+<label x="63.5" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PF0/I2C1_SDA"/>
 </segment>
 </net>
 <net name="!RES" class="0">
 <segment>
 <wire x1="73.66" y1="50.8" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
-<label x="73.66" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<label x="58.42" y="142.24" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="58.42" y1="142.24" x2="66.04" y2="142.24" width="0.1524" layer="91"/>
+<label x="63.5" y="142.24" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="142.24" x2="66.04" y2="142.24" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
 </segment>
 </net>
 <net name="D/!C" class="0">
 <segment>
 <wire x1="73.66" y1="48.26" x2="76.2" y2="48.26" width="0.1524" layer="91"/>
-<label x="73.66" y="48.26" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<label x="58.42" y="139.7" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="58.42" y1="139.7" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
+<label x="63.5" y="139.7" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="139.7" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA4/ADC4"/>
 </segment>
 </net>
 <net name="T-" class="0">
 <segment>
 <pinref part="JP4" gate="G$1" pin="2"/>
-<wire x1="254" y1="96.52" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
-<label x="228.6" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="96.52" x2="246.38" y2="96.52" width="0.1524" layer="91"/>
+<label x="246.38" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="C4" gate="G$1" pin="1"/>
+<pinref part="C9" gate="G$1" pin="1"/>
 <wire x1="251.46" y1="152.4" x2="251.46" y2="157.48" width="0.1524" layer="91"/>
 <wire x1="251.46" y1="152.4" x2="254" y2="152.4" width="0.1524" layer="91"/>
 <junction x="251.46" y="152.4"/>
 <label x="254" y="152.4" size="1.27" layer="95" xref="yes"/>
-<pinref part="U3" gate="G$1" pin="T-"/>
+<pinref part="IC1" gate="G$1" pin="T-"/>
 <wire x1="220.98" y1="160.02" x2="231.14" y2="160.02" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="160.02" x2="231.14" y2="152.4" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="152.4" x2="251.46" y2="152.4" width="0.1524" layer="91"/>
@@ -4620,16 +4407,16 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="T+" class="0">
 <segment>
 <pinref part="JP4" gate="G$1" pin="1"/>
-<wire x1="254" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
-<label x="228.6" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="99.06" x2="246.38" y2="99.06" width="0.1524" layer="91"/>
+<label x="246.38" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="C4" gate="G$1" pin="2"/>
+<pinref part="C9" gate="G$1" pin="2"/>
 <wire x1="251.46" y1="167.64" x2="251.46" y2="165.1" width="0.1524" layer="91"/>
 <wire x1="251.46" y1="167.64" x2="254" y2="167.64" width="0.1524" layer="91"/>
 <junction x="251.46" y="167.64"/>
 <label x="254" y="167.64" size="1.27" layer="95" xref="yes"/>
-<pinref part="U3" gate="G$1" pin="T+"/>
+<pinref part="IC1" gate="G$1" pin="T+"/>
 <wire x1="220.98" y1="162.56" x2="231.14" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="162.56" x2="231.14" y2="167.64" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="167.64" x2="251.46" y2="167.64" width="0.1524" layer="91"/>
@@ -4639,125 +4426,143 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="CENTER"/>
 <wire x1="139.7" y1="30.48" x2="129.54" y2="30.48" width="0.1524" layer="91"/>
-<label x="129.54" y="30.48" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="152.4" y1="149.86" x2="154.94" y2="149.86" width="0.1524" layer="91"/>
-<label x="154.94" y="149.86" size="1.016" layer="95" xref="yes"/>
+<label x="154.94" y="149.86" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="SPI_MOSI" class="0">
 <segment>
 <wire x1="73.66" y1="43.18" x2="76.2" y2="43.18" width="0.1524" layer="91"/>
-<label x="73.66" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SDIN"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="132.08" x2="55.88" y2="132.08" width="0.1524" layer="91"/>
-<label x="55.88" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="132.08" x2="63.5" y2="132.08" width="0.1524" layer="91"/>
+<label x="63.5" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
 </segment>
 </net>
 <net name="SPI_MISO" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="SO"/>
+<pinref part="IC1" gate="G$1" pin="SO"/>
 <wire x1="187.96" y1="160.02" x2="190.5" y2="160.02" width="0.1524" layer="91"/>
-<label x="187.96" y="160.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="134.62" x2="55.88" y2="134.62" width="0.1524" layer="91"/>
-<label x="55.88" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="134.62" x2="63.5" y2="134.62" width="0.1524" layer="91"/>
+<label x="63.5" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
 </segment>
 </net>
 <net name="SPI_SCK" class="0">
 <segment>
 <wire x1="73.66" y1="45.72" x2="76.2" y2="45.72" width="0.1524" layer="91"/>
-<label x="73.66" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SCLK"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="SCK"/>
+<pinref part="IC1" gate="G$1" pin="SCK"/>
 <wire x1="187.96" y1="165.1" x2="190.5" y2="165.1" width="0.1524" layer="91"/>
-<label x="187.96" y="165.1" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="165.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="137.16" x2="55.88" y2="137.16" width="0.1524" layer="91"/>
-<label x="55.88" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="137.16" x2="63.5" y2="137.16" width="0.1524" layer="91"/>
+<label x="63.5" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
 </segment>
 </net>
 <net name="!CS_OLED" class="0">
 <segment>
 <wire x1="73.66" y1="53.34" x2="76.2" y2="53.34" width="0.1524" layer="91"/>
-<label x="73.66" y="53.34" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="144.78" x2="55.88" y2="144.78" width="0.1524" layer="91"/>
-<label x="55.88" y="144.78" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="144.78" x2="63.5" y2="144.78" width="0.1524" layer="91"/>
+<label x="63.5" y="144.78" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
 </segment>
 </net>
 <net name="!CS_MAX" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="!CS"/>
+<pinref part="IC1" gate="G$1" pin="!CS"/>
 <wire x1="187.96" y1="162.56" x2="190.5" y2="162.56" width="0.1524" layer="91"/>
-<label x="187.96" y="162.56" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="162.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="152.4" y1="144.78" x2="162.56" y2="144.78" width="0.1524" layer="91"/>
-<label x="162.56" y="144.78" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="144.78" x2="154.94" y2="144.78" width="0.1524" layer="91"/>
+<label x="154.94" y="144.78" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="USART2_RX/PA15"/>
 </segment>
 </net>
 <net name="AUX-TX" class="0">
 <segment>
+<wire x1="152.4" y1="129.54" x2="154.94" y2="129.54" width="0.1524" layer="91"/>
+<label x="154.94" y="129.54" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
-<wire x1="152.4" y1="129.54" x2="190.5" y2="129.54" width="0.1524" layer="91"/>
-<label x="190.5" y="129.54" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="2"/>
-<wire x1="248.92" y1="81.28" x2="254" y2="81.28" width="0.1524" layer="91"/>
-<label x="248.92" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="236.22" y1="83.82" x2="241.3" y2="83.82" width="0.1524" layer="91"/>
+<label x="236.22" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="R3" gate="G$1" pin="1"/>
+<wire x1="241.3" y1="83.82" x2="246.38" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="83.82" x2="246.38" y2="81.28" width="0.1524" layer="91"/>
+<junction x="246.38" y="83.82"/>
+<pinref part="JP5" gate="G$1" pin="2"/>
+<pinref part="C8" gate="G$1" pin="1"/>
+<wire x1="241.3" y1="83.82" x2="241.3" y2="78.74" width="0.1524" layer="91"/>
+<junction x="241.3" y="83.82"/>
+</segment>
+<segment>
+<pinref part="U1" gate="G$1" pin="PB1/ADC9"/>
+<wire x1="63.5" y1="127" x2="66.04" y2="127" width="0.1524" layer="91"/>
+<label x="63.5" y="127" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="AUX-RX" class="0">
 <segment>
+<wire x1="152.4" y1="132.08" x2="154.94" y2="132.08" width="0.1524" layer="91"/>
+<label x="154.94" y="132.08" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
-<wire x1="152.4" y1="132.08" x2="190.5" y2="132.08" width="0.1524" layer="91"/>
-<label x="190.5" y="132.08" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="1"/>
-<wire x1="248.92" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
-<label x="248.92" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="236.22" y1="86.36" x2="254" y2="86.36" width="0.1524" layer="91"/>
+<label x="236.22" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="JP5" gate="G$1" pin="1"/>
+</segment>
+<segment>
+<pinref part="U1" gate="G$1" pin="PB0/ADC8"/>
+<wire x1="63.5" y1="129.54" x2="66.04" y2="129.54" width="0.1524" layer="91"/>
+<label x="63.5" y="129.54" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<pinref part="J1" gate="J" pin="SCK"/>
-<wire x1="254" y1="63.5" x2="259.08" y2="63.5" width="0.1524" layer="91"/>
-<label x="254" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="154.94" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
+<label x="154.94" y="142.24" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
-<wire x1="172.72" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
-<label x="172.72" y="142.24" size="1.27" layer="95" xref="yes"/>
+<wire x1="215.9" y1="60.96" x2="220.98" y2="60.96" width="0.1524" layer="91"/>
+<label x="215.9" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="SWCLK"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
-<pinref part="J1" gate="J" pin="MISO"/>
-<wire x1="254" y1="60.96" x2="259.08" y2="60.96" width="0.1524" layer="91"/>
-<label x="254" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="154.94" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
+<label x="154.94" y="139.7" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
 </segment>
 <segment>
-<pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
-<wire x1="172.72" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
-<label x="172.72" y="139.7" size="1.27" layer="95" xref="yes"/>
+<wire x1="215.9" y1="58.42" x2="220.98" y2="58.42" width="0.1524" layer="91"/>
+<label x="215.9" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="SWDIO"/>
 </segment>
 </net>
 </nets>