I still need to do this refactoring work. Missed it in the today rewrite...