temp
merged 12-8, IR working
lots of calibration done