WIP - fixing the terrible week vs. month bug