Sensor code updates

...gic is there as a placeholder (sorry).