More changes should be getting close to basic functionality being restored
Merge branch 'master' of https://github.com/ZacharyTaylor/Multimodal-Calib