Complete refactoring of Sensor and Sensor callbacks. TriggerZone work in progress.