Rewrote things in go
Tweaks