#1 In Progress - Improved sensor handling