Bunch more changes adding compass.