Added in Sensor gathering, and database store / retrieve calsses