Changing how values are calculating to be range-based
Adjusting time frames properly
Updating readme