Tracking and kin


work in progress