reorged a few things.
Adding compass.