Further refactoring

Changed 7 day readings to take average of previous hour.
In process of adding min max