First Version to support 2 sensors

This is NOT tested, but compiles and should not change any
functionality.