Refactored sensors to use pointers, should work now