Refactor of date ranges
Refactors categories
WIP