Add other sensor, refactor program