WIP Upload to correct sensor

Fix #369