Sensor integration

mbaptist23 sending pull request to see if mickeys changes will merge clean