More refactoring.
In the process of expanding hourly.
Whew... expanding hourly is almost working. This is quite possibly the worst code Ive ever written.