Compass Mark V.2

Rebounding my first compass mark with changes made as per some advice from @Steffen Nørgaard Andersen on my last shot! C&C appreciated as always.

I do feel it's a little too complex so I'm working on something a bit simpler.