s106 update

still lots todo but mapping feature in place