More refactoring in progress... working towards expanding hourly.