Part 2 of TOU refactor. Now using new tables