Added Basic Sensor Framework
Optimized some code
Removed old TODOs