Reorganized for testing more sensors
Added various sensors. Cleaned out backup files