refactoring (another time) of the sensor data, thinking about adding support for persistance
merged changes