Sensors refactor

Switching over to new sensor system.