[g+j] refactored stories and UserJourneyBase & Changed Calculator to recalculate daily instead of Weekly